Merge branch 'master' of https://github.com/tperalta82/netdata

[netdata.git] / plugins.d / alarm-notify.sh

diff --git a/plugins.d/alarm-notify.sh b/plugins.d/alarm-notify.sh
index 126c745bb9cf5c88fc2f59fcb95680fb7386783b..e6be8df779fe0dc2a55ce10c8952dd18d25e02cd 100755 (executable)
--- a/plugins.d/alarm-notify.sh
+++ b/plugins.d/alarm-notify.sh
@@ -458,7 +458,11 @@ send_pushover() {
 # pushbullet sender
 
 send_pushbullet() {
+<<<<<<< HEAD
     local userapikey="${1}" recipients="${2}" message="${3}" title="${4}" httpcode sent=0 user
+=======
+    local userapikey="${1}" recipients="${2}" message="${3}" title="${4}" httpcode sent=0 user priority
+>>>>>>> 863efae676a63da80a868908ad03eab89e7380ab
 
     if [ "${SEND_PUSHBULLET}" = "YES" -a ! -z "${userapikey}" -a ! -z "${recipients}" -a ! -z "${message}" -a ! -z "${title}" ]
         then