From c7d724875d2f274047f7e5fa9c2394beb9007a28 Mon Sep 17 00:00:00 2001
From: JaySparrow <jay624871@gmail.com>
Date: Fri, 12 Jun 2020 16:26:17 -0500
Subject: [PATCH] Update tgstation.dme

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

diff --git a/tgstation.dme b/tgstation.dme
index 6ec9a6c8..ff636be0 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -109,6 +109,7 @@
 #include "code\__DEFINES\vv.dm"
 #include "code\__DEFINES\wall_dents.dm"
 #include "code\__DEFINES\wires.dm"
+#include "code\__DEFINES\dcs\signals.dm"
 #include "code\__HELPERS\_cit_helpers.dm"
 #include "code\__HELPERS\_lists.dm"
 #include "code\__HELPERS\_logging.dm"
@@ -2742,10 +2743,7 @@
 #include "code\modules\station_goals\station_goal.dm"
 #include "code\modules\surgery\amputation.dm"
 #include "code\modules\surgery\brain_surgery.dm"
-<<<<<<< HEAD
-=======
 #include "code\modules\surgery\breast_augmentation.dm"
->>>>>>> parent of fe39969... Enable leash.dm
 #include "code\modules\surgery\cavity_implant.dm"
 #include "code\modules\surgery\core_removal.dm"
 #include "code\modules\surgery\coronary_bypass.dm"