From b1cae73733b8812726e989ed3c0ef2539da87f4e Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 2 Apr 2023 19:38:56 -0400
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 aa81c2c336..156a53dc26 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3289,12 +3289,9 @@
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose_ch.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose_vr.dm"
-<<<<<<< HEAD
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\mouse_army_ch.dm"
-=======
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\ray.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\shark.dm"
->>>>>>> c84577bb3c... Merge pull request #14747 from KillianKirilenko/kk-critters
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\snake_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\space.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\space\space_vr.dm"