merge conflict

Fluffy-Frontier · Feb 20, 2024 · d18c69f · d18c69f
1 parent 90a283f
commit d18c69f
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/modular_nova/modules/blueshield/code/closet.dm b/modular_nova/modules/blueshield/code/closet.dm
@@ -33,13 +33,8 @@
 	new /obj/item/assembly/flash/handheld(src)
 	new /obj/item/restraints/handcuffs(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
-<<<<<<< HEAD
-	new /obj/item/storage/medkit/tactical/blueshield(src)
-	// new /obj/item/storage/toolbox/guncase/nova/xhihao_large_case/bogseo(src) FF EDIT: DELETION - BLUESHIELD-REARM
-=======
 	new /obj/item/storage/medkit/frontier/stocked(src)
-	new /obj/item/storage/toolbox/guncase/nova/xhihao_large_case/bogseo(src)
->>>>>>> b8061af7e (And look, the red just washes right out! | Changes a lot of blueshield equipment stuff and resprites their crew monitor (#372))
+	// new /obj/item/storage/toolbox/guncase/nova/xhihao_large_case/bogseo(src) FF EDIT: DELETION - BLUESHIELD-REARM
 	new /obj/item/storage/bag/garment/blueshield(src)
 	new /obj/item/mod/control/pre_equipped/blueshield(src)
 	new /obj/item/sensor_device/blueshield(src)