From edcf7441cf49c8e52b1b36bb8a0de9339ea2962d Mon Sep 17 00:00:00 2001 From: Feenie <62373791+FeenieRU@users.noreply.github.com> Date: Tue, 24 Dec 2024 19:42:10 +0300 Subject: [PATCH] Fix conflict --- code/modules/unit_tests/simple_animal_freeze.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index d4750181a4b..97b98a6f03d 100644 --- a/code/modules/unit_tests/simple_animal_freeze.dm +++ b/code/modules/unit_tests/simple_animal_freeze.dm @@ -125,7 +125,6 @@ /mob/living/simple_animal/hostile/vox/ranged/space/laser, /mob/living/simple_animal/hostile/zombie/cheesezombie, /mob/living/simple_animal/hostile/zombie/nocorpse, -<<<<<<< HEAD /mob/living/simple_animal/hostile/fleshmind/slicer, /mob/living/simple_animal/hostile/fleshmind/floater, /mob/living/simple_animal/hostile/fleshmind/globber, @@ -137,9 +136,7 @@ /mob/living/simple_animal/hostile/fleshmind/mechiver, /mob/living/simple_animal/hostile/fleshmind/mauler_monkey, /mob/living/simple_animal/hostile/fleshmind, -======= /mob/living/simple_animal/hostile/ooze/grapes/xenobio, // update when grapes are updated, must be here to stop errors ->>>>>>> 0edd8dc6343 (Add Neglected Mobs to Gold Slime Spawns (#4699)) // DO NOT ADD NEW ENTRIES TO THIS LIST // READ THE COMMENT ABOVE