From 0987619a55fad6d4fb8a6fe76998053b7e372721 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 30 Sep 2017 02:56:33 -0500
Subject: [PATCH] Update tgstation.dme

---
 tgstation.dme | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tgstation.dme b/tgstation.dme
index 46b6dd1034..bc8af51b99 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -193,7 +193,6 @@
 #include "code\controllers\admin.dm"
 #include "code\controllers\configuration.dm"
 #include "code\controllers\configuration_citadel.dm"
-=======
 #include "code\controllers\configuration\entries\comms.dm"
 #include "code\controllers\configuration\entries\config.dm"
 #include "code\controllers\configuration\entries\dbconfig.dm"
@@ -201,7 +200,6 @@
 #include "code\controllers\configuration\config_entry.dm"
 #include "code\controllers\configuration\configuration.dm"
 #include "code\controllers\admin.dm"
->>>>>>> 4178c20... Configuration datum refactor (#30763)
 #include "code\controllers\controller.dm"
 #include "code\controllers\failsafe.dm"
 #include "code\controllers\globals.dm"