From 53d63a29f8af194b35b3ef65cbb895cd838ce027 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Sun, 8 Oct 2017 18:37:34 -0400
Subject: [PATCH] i thought i commited this...

---
 code/modules/customitems/item_defines.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 6a90fa7e1f0..348a9178721 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -1224,9 +1224,6 @@
 	item_color = "fethasnecklace"
 	slot_flags = SLOT_MASK | SLOT_TIE
 
-<<<<<<< HEAD
-
-=======
 /obj/item/weapon/bedsheet/fluff/hugosheet //HugoLuman: Dan Martinez
 	name = "Cosmic space blankie"
 	desc = "Made from the dreams of space children everywhere."
@@ -1235,5 +1232,4 @@
 	righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
 	icon_state = "sheetcosmos"
 	item_state = "sheetcosmos"
-	item_color = "sheetcosmos"
->>>>>>> 179477ed078256f709c70b05fd03040cb8d46ca3
+	item_color = "sheetcosmos"
\ No newline at end of file