Update custom_items.dm

2018-07-06 00:46:48 -05:00
parent 5cacbfbe2e
commit b245b940a4
1 changed files with 0 additions and 4 deletions
@@ -371,11 +371,7 @@
 	icon_state = "leechjar"
 	item_state = "leechjar"

-<<<<<<< HEAD
-	path = /obj/item/bedsheet/custom/flagcape
-=======
 /obj/item/bedsheet/custom/flagcape
->>>>>>> 5924595c8d02754cc68433771a8bedbfafdd26dd
 	name = "Flag Cape"
 	desc = "A truly patriotic form of heroic attire."
 	icon = 'icons/obj/custom.dmi'