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

---
 vorestation.dme | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/vorestation.dme b/vorestation.dme
index 24e8b8d674..681d8ba576 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3135,12 +3135,9 @@
 #include "code\modules\mob\living\simple_mob\subtypes\animal\vox.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\catslug.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\jellyfish.dm"
-<<<<<<< HEAD
 #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\skeleton.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\space_mouse.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\spacewhale.dm"
-=======
->>>>>>> b8bd9f130c... Merge pull request #11834 from Very-Soft/QOLwow
 #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\spookyghost.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\startreader.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\alien animals\teppi.dm"