From 7e20f4f88454c222beb905193686b2a4cefdb990 Mon Sep 17 00:00:00 2001
From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
Date: Sun, 20 Jun 2021 03:33:57 -0400
Subject: [PATCH] Update tgstation.dme

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

diff --git a/tgstation.dme b/tgstation.dme
index 8fb3003c99..2399f5f09a 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1733,11 +1733,8 @@
 #include "code\modules\antagonists\slaughter\slaughter.dm"
 #include "code\modules\antagonists\slaughter\slaughter_antag.dm"
 #include "code\modules\antagonists\slaughter\slaughterevent.dm"
-<<<<<<< HEAD
 #include "code\modules\antagonists\space_ninja\space_ninja.dm"
-=======
 #include "code\modules\antagonists\space_dragon\space_dragon.dm"
->>>>>>> 0a1f0d3e66ef5293cde8201f68199d30a6794968
 #include "code\modules\antagonists\survivalist\survivalist.dm"
 #include "code\modules\antagonists\swarmer\swarmer.dm"
 #include "code\modules\antagonists\swarmer\swarmer_event.dm"
@@ -2107,11 +2104,8 @@
 #include "code\modules\events\radiation_storm.dm"
 #include "code\modules\events\sentience.dm"
 #include "code\modules\events\shuttle_loan.dm"
-<<<<<<< HEAD
 #include "code\modules\events\space_ninja.dm"
-=======
 #include "code\modules\events\space_dragon.dm"
->>>>>>> 0a1f0d3e66ef5293cde8201f68199d30a6794968
 #include "code\modules\events\spacevine.dm"
 #include "code\modules\events\spider_infestation.dm"
 #include "code\modules\events\spontaneous_appendicitis.dm"