Update __donator.dm

2018-07-06 00:54:01 -05:00
parent a64dba6270
commit 5ad7fc35fd
1 changed files with 1 additions and 3 deletions
@@ -296,16 +296,14 @@ datum/gear/darksabresheath
 	path = /obj/item/clothing/suit/armor/vest/darkcarapace
 	ckeywhitelist = list("inferno707")

-<<<<<<< HEAD
 /datum/gear/devilwings
 	name = "Strange Wings"
 	category = SLOT_NECK
 	path = /obj/item/clothing/neck/devilwings
 	ckeywhitelist = list("kitsun")
-=======
+
 /datum/gear/flagcape
 	name = "US Flag Cape"
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/bedsheet/custom/flagcape
 	ckeywhitelist = list("darnchacha")
->>>>>>> flagcape