From 6901dba147fee2055de17086d6f087f7b0b696aa Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Fri, 27 Oct 2017 23:56:50 -0500
Subject: [PATCH] Update tgstation.dme

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

diff --git a/tgstation.dme b/tgstation.dme
index 87f4bfc69b..f9657cb7da 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -29,11 +29,8 @@
 #include "code\__DEFINES\atom_hud.dm"
 #include "code\__DEFINES\callbacks.dm"
 #include "code\__DEFINES\cinematics.dm"
-<<<<<<< HEAD
 #include "code\__DEFINES\citadel_defines.dm"
-=======
 #include "code\__DEFINES\cleaning.dm"
->>>>>>> 5dde2e3... Merge pull request #31864 from ninjanomnom/thermite
 #include "code\__DEFINES\clockcult.dm"
 #include "code\__DEFINES\combat.dm"
 #include "code\__DEFINES\components.dm"