Fix notifications.cfg merge conflict

diff --git a/notifications.cfg b/notifications.cfg
index 83874ed863c55c48cd86143a3588897e360175fb..4ede8914f58581efef2c036b06c959e4479baa9e 100644 (file)
--- a/notifications.cfg
+++ b/notifications.cfg
@@ -345,11 +345,7 @@ seta notification_INFO_WEAPON_TUBA_SUICIDE "1" "0 = off, 1 = print to console, 2
 seta notification_INFO_WEAPON_VAPORIZER_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 seta notification_INFO_WEAPON_VORTEX_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 
-<<<<<<< HEAD
-// MSG_CENTER notifications (count = 243):
-=======
 // MSG_CENTER notifications:
->>>>>>> master
 seta notification_CENTER_ALONE "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_ASSAULT_ATTACKING "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_ASSAULT_DEFENDING "1" "0 = off, 1 = centerprint"