Update lavaland_ruin_code.dm

2018-02-11 18:31:57 -05:00
parent e2b4e3c567
commit e69a597fb2
1 changed files with 0 additions and 4 deletions
@@ -137,9 +137,6 @@
 	r_hand = /obj/item/melee/transforming/energy/sword/saber
 	mask = /obj/item/clothing/mask/chameleon
 	suit = /obj/item/clothing/suit/armor/vest
-<<<<<<< HEAD
-	l_pocket = /obj/item/card/id/syndicate/anyone
-=======

 /obj/item/clothing/mask/chameleon/gps/Initialize()
 	. = ..()
@@ -147,4 +144,3 @@

 /obj/item/device/gps/internal/lavaland_syndicate_base
 	gpstag = "Encrypted Signal"
->>>>>>> 47ed29c... Merge pull request #35514 from ShizCalev/ghost-role-syndi-access