From f8c02be1b59ec5b91eb2e059f31489be84568bbd Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 26 Sep 2017 14:02:02 -0500
Subject: [PATCH] Update tgstation.dme

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

diff --git a/tgstation.dme b/tgstation.dme
index f1dbfb642b..4a20f4ee7d 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -28,11 +28,8 @@
 #include "code\__DEFINES\atmospherics.dm"
 #include "code\__DEFINES\atom_hud.dm"
 #include "code\__DEFINES\callbacks.dm"
-<<<<<<< HEAD
 #include "code\__DEFINES\citadel_defines.dm"
-=======
 #include "code\__DEFINES\cinematics.dm"
->>>>>>> 1304e83... Refactors cinematics. (#30888)
 #include "code\__DEFINES\clockcult.dm"
 #include "code\__DEFINES\combat.dm"
 #include "code\__DEFINES\components.dm"