Update config.txt

2017-09-11 18:28:39 -05:00
parent e5cc2c1e4e
commit 7d4c6a8445
1 changed files with 0 additions and 3 deletions
@@ -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)