From 2dda11b280e90dd27aabcec68e7532179f48c099 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 19 Mar 2023 08:56:21 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/game/objects/structures/ghost_pods/event_vr.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm
index a325072b3a..98d54513d5 100644
--- a/code/game/objects/structures/ghost_pods/event_vr.dm
+++ b/code/game/objects/structures/ghost_pods/event_vr.dm
@@ -59,13 +59,9 @@
 								  "Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless,
 								  "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless,
 								  "Weretiger" = /mob/living/simple_mob/vore/weretiger,
-<<<<<<< HEAD
 								  "Lesser Large Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred,	//CHOMPStation add.
-								  "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug
-=======
 								  "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug,
 								  "Squirrel" = /mob/living/simple_mob/vore/squirrel/big
->>>>>>> 1bad31fe38... Merge pull request #14676 from Very-Soft/squirrel
 								  )
 
 /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M)