Update medical.dm

2017-12-08 12:23:03 -05:00
parent 315e1d718a
commit bc4b689d56
1 changed files with 0 additions and 4 deletions
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -73,11 +73,7 @@
 	new /obj/item/device/autosurgeon/cmo(src)
 	new /obj/item/door_remote/chief_medical_officer(src)
 	new /obj/item/clothing/neck/petcollar(src)
-<<<<<<< HEAD
-=======
 	new /obj/item/pet_carrier(src)
-	new /obj/item/circuitboard/machine/protolathe/department/medical(src)
->>>>>>> 6e8401e... Adds pet carriers (#33231)

 /obj/structure/closet/secure_closet/animal
 	name = "animal control"