From 4d3b7ddcbd733bc4cfe36d458a627975b2832dc9 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 30 Dec 2017 13:37:23 -0600
Subject: [PATCH] Update color.dm

---
 code/modules/clothing/gloves/color.dm | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 83e8f817c5..75d6c66077 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -205,18 +205,9 @@
 		/obj/item/clothing/gloves/color/brown = 1)
 
 	var/obj/item/clothing/gloves/color/selected = pick(gloves)
-<<<<<<< HEAD
-
-	name = initial(selected.name)
-	desc = initial(selected.desc)
-	icon_state = initial(selected.icon_state)
-	item_state = initial(selected.item_state)
-	item_color = initial(selected.item_color)
-=======
 	if(ishuman(loc))
 		var/mob/living/carbon/human/H = loc
 		H.equip_to_slot_or_del(new selected(H), slot_gloves)
 	else
 		new selected(loc)
 	return INITIALIZE_HINT_QDEL
->>>>>>> c063902... Merge pull request #33930 from ShizCalev/undersuit-fix