From 083fa00a148b3b82df2c277fda2d64f9538b9eac Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 6 May 2018 03:12:14 -0400
Subject: [PATCH] Update tgstation.dme

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

diff --git a/tgstation.dme b/tgstation.dme
index 861f6221e6..815f540983 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -323,11 +323,8 @@
 #include "code\datums\components\cleaning.dm"
 #include "code\datums\components\construction.dm"
 #include "code\datums\components\decal.dm"
-<<<<<<< HEAD
-=======
 #include "code\datums\components\earhealing.dm"
 #include "code\datums\components\earprotection.dm"
->>>>>>> fd4c753... replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2  (#37597)
 #include "code\datums\components\forensics.dm"
 #include "code\datums\components\infective.dm"
 #include "code\datums\components\jousting.dm"