From 4f4fe9824004b69d290839b3c8ca1814217532fc Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 30 Sep 2017 02:57:20 -0500
Subject: [PATCH] Update tgstation.dme

---
 tgstation.dme | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tgstation.dme b/tgstation.dme
index bc8af51b99..3d6a9e1a2d 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -163,7 +163,6 @@
 #include "code\_onclick\hud\robot.dm"
 #include "code\_onclick\hud\screen_objects.dm"
 #include "code\_onclick\hud\swarmer.dm"
-<<<<<<< HEAD
 #include "code\citadel\_cit_helpers.dm"
 #include "code\citadel\cit_areas.dm"
 #include "code\citadel\cit_arousal.dm"