From 188eaf06a2eb1cf66679886402cfe126e56f940a Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 31 Jul 2020 16:47:53 -0400
Subject: [PATCH] Update clothing.dm

---
 code/modules/clothing/under/accessories/clothing.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm
index 29ea5883172..775a615dc75 100644
--- a/code/modules/clothing/under/accessories/clothing.dm
+++ b/code/modules/clothing/under/accessories/clothing.dm
@@ -400,11 +400,8 @@
 	name = "green asymmetrical jacket"
 	desc = "Insultingly avant-garde in aqua."
 	icon_state = "asym_green"
-<<<<<<< HEAD
-=======
 
 /obj/item/clothing/accessory/asymovercoat
 	name = "orange asymmetrical overcoat"
 	desc = "An asymmetrical orange overcoat in a 2560's fashion."
 	icon_state = "asymovercoat"
->>>>>>> 7a84236... Adds 2 uniforms, 1 accessory, and flower crowns to loadout (#7385)