From: LegendaryGuard <theasixchan777@gmail.com>
Date: Tue, 11 Oct 2022 16:18:33 +0000 (+0200)
Subject: Fix notifications.cfg merge conflict
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1099b2fd9e25ff63f6e6286c7fe6857f29071dd0;p=xonotic%2Fxonotic-data.pk3dir.git

Fix notifications.cfg merge conflict
---

diff --git a/notifications.cfg b/notifications.cfg
index 83874ed86..4ede8914f 100644
--- 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"