From 27e0d531c622c412ca1d0829d55e6d6737f21ac0 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 17 Dec 2017 15:55:23 -0600
Subject: [PATCH] Update tgstation.dme

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

diff --git a/tgstation.dme b/tgstation.dme
index b9852a55bc..d6fb877efa 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1623,8 +1623,6 @@
 #include "code\modules\jobs\job_types\security.dm"
 #include "code\modules\jobs\job_types\silicon.dm"
 #include "code\modules\jobs\map_changes\map_changes.dm"
-<<<<<<< HEAD
-=======
 #include "code\modules\keybindings\bindings_admin.dm"
 #include "code\modules\keybindings\bindings_atom.dm"
 #include "code\modules\keybindings\bindings_carbon.dm"
@@ -1636,7 +1634,6 @@
 #include "code\modules\keybindings\focus.dm"
 #include "code\modules\keybindings\setup.dm"
 #include "code\modules\language\aphasia.dm"
->>>>>>> b5d9845... [Ready]Brain Trauma additions (#33405)
 #include "code\modules\language\beachbum.dm"
 #include "code\modules\language\codespeak.dm"
 #include "code\modules\language\common.dm"