From 0fd8caed89bd83e648b7ea807a55c6a57109b6a4 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 5 Dec 2021 12:33:31 -0500
Subject: [PATCH] powder that makes you say yes

---
 .../subtypes/animal/giant_spider/giant_spider_vr.dm           | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
index 9ffca5a570..c63ac35fa8 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
@@ -51,12 +51,8 @@
 	default_pixel_x = -16
 	old_x = -16
 	old_y = 0
-<<<<<<< HEAD
-	
-=======
 	meat_amount = 15
 
->>>>>>> c07a9e00a0... Merge pull request #11912 from Heroman3003/simpler-butchering
 	egg_type = /obj/effect/spider/eggcluster/royal
 
 /mob/living/simple_mob/animal/giant_spider/webslinger/event // YW CHANGE