Removed bad merge stuff
Tiago Peralta committed
Oct 5, 2016 at 02:17 UTC
018c01f686c5f3df49e54e5783140db5782fd6ff
1 file changed
-4
plugins.d/alarm-notify.sh
-4
@@ -458,11 +458,7 @@ send_pushover() {
458
# pushbullet sender
459
460
send_pushbullet() {
461
-<<<<<<< HEAD
461
local userapikey="${1}" recipients="${2}" message="${3}" title="${4}" httpcode sent=0 user
463
-=======
464
- local userapikey="${1}" recipients="${2}" message="${3}" title="${4}" httpcode sent=0 user priority
465
->>>>>>> 863efae676a63da80a868908ad03eab89e7380ab
462
463
if [ "${SEND_PUSHBULLET}" = "YES" -a ! -z "${userapikey}" -a ! -z "${recipients}" -a ! -z "${message}" -a ! -z "${title}" ]
464
then