forgot to delete the head thingy

cmss13-devs · Feb 26, 2024 · 9996518 · 9996518
1 parent 70c587e
commit 9996518
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm
@@ -649,7 +649,6 @@
 	flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE
 	unacidable = TRUE
 
-<<<<<<< HEAD
 /obj/item/clothing/suit/storage/marine/light/vest/xm43e1_vest
 	name = "\improper XM-3VL pattern fire support vest"
 	armor_melee = CLOTHING_ARMOR_MEDIUM
@@ -662,8 +661,6 @@
 	flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE
 	unacidable = TRUE
 
-=======
->>>>>>> upstream/master
 /obj/item/clothing/suit/storage/RO
 	name = "quartermaster jacket"
 	desc = "A green jacket worn by USCM personnel. The back has the flag of the United Americas on it."