From 1099b2fd9e25ff63f6e6286c7fe6857f29071dd0 Mon Sep 17 00:00:00 2001 From: LegendaryGuard Date: Tue, 11 Oct 2022 18:18:33 +0200 Subject: [PATCH] Fix notifications.cfg merge conflict --- notifications.cfg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/notifications.cfg b/notifications.cfg index 83874ed863..4ede8914f5 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" -- 2.39.2