From 110d37a4e55fc5dc978f249268b4d5e0759b4800 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 21 Jan 2020 01:11:02 -0500
Subject: [PATCH] Update misc_special.dm

---
 code/modules/clothing/head/misc_special.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index cdb93b8f8d3..643c335f739 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -99,10 +99,6 @@
 		slot_l_hand_str = "engiewelding",
 		slot_r_hand_str = "engiewelding",
 		)
-<<<<<<< HEAD
-
-=======
->>>>>>> 9684db1... Merge pull request #6636 from SpaceManiac/patch/syntax
 
 /*
  * Cakehat