Conflicts resolved, excluding the .dme

2026-08-29 15:08:34 +01:00 · 2019-01-05 16:38:33 -05:00
parent 58e4a98a94
commit 5cb647993c
4 changed files with 5 additions and 223 deletions
@@ -9,12 +9,8 @@ var/list/ventcrawl_machinery = list(
 	/obj/item/device/radio/borg,
 	/obj/item/weapon/holder,
 	/obj/machinery/camera,
-<<<<<<< HEAD
 	/mob/living/simple_animal/borer,
 	/obj/belly, //VOREStation Edit,
-=======
-	/mob/living/simple_mob/animal/borer,
->>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
 	/obj/screen
 	)