From 4ac9269cdf411ec4c9fda2be11d3b978b23ddfda Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Thu, 11 Jan 2018 15:15:50 -0600
Subject: [PATCH] Update configuration.dm

---
 code/controllers/configuration/configuration.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index 484ccdab87..5936c564ce 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -22,11 +22,7 @@ GLOBAL_PROTECT(config_dir)
 	config = src
 	InitEntries()
 	LoadModes()
-<<<<<<< HEAD
-	if(LoadEntries("config.txt") <= 1)
-=======
 	if(fexists("config/config.txt") && LoadEntries("config.txt") <= 1)
->>>>>>> f860a0f... Merge pull request #34290 from tgstation/Cyberboss-patch-2
 		log_config("No $include directives found in config.txt! Loading legacy game_options/dbconfig/comms files...")
 		LoadEntries("game_options.txt")
 		LoadEntries("dbconfig.txt")