From 7d4c6a84459ce51fae64e5f7e2406de54964870b Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 11 Sep 2017 18:28:39 -0500
Subject: [PATCH] Update config.txt

---
 config/config.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/config.txt b/config/config.txt
index 6effd92b53..652651e425 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -337,9 +337,6 @@ MINUTE_TOPIC_LIMIT 100
 
 ## Send a message to IRC when starting a new game
 #IRC_ANNOUNCE_NEW_GAME
-<<<<<<< HEAD
-=======
 
 ## Allow admin hrefs that don't use the new token system, will eventually be removed
 DEBUG_ADMIN_HREFS
->>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839)