From 0eb053e0d363b7a4dde58d4788c225c9e5de931d Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Fri, 16 Feb 2018 23:37:02 -0600
Subject: [PATCH] Update tgstation.dme

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

diff --git a/tgstation.dme b/tgstation.dme
index 92ab64b374..ff179f682f 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2029,12 +2029,9 @@
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\blood_drunk_miner.dm"
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\bubblegum.dm"
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\colossus.dm"
-<<<<<<< HEAD
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\dragon.dm"
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\dragon_vore.dm"
-=======
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\drake.dm"
->>>>>>> a2ccca5... All medal methods are handled on SSmedals as opposed to global procs and also have proper defines. Killing with a crusher grants special medals. (#35673)
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\hierophant.dm"
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\legion.dm"
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\megafauna.dm"