From ebc7a24e47e7b4306da2b522a3515ad31e94b2c0 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 19 Feb 2022 18:58:03 -0500
Subject: [PATCH] powder that makes you say yes

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

diff --git a/vorestation.dme b/vorestation.dme
index 89e3bbde35..0b4b9a4603 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3750,11 +3750,8 @@
 #include "code\modules\projectiles\gun.dm"
 #include "code\modules\projectiles\gun_ch.dm"
 #include "code\modules\projectiles\projectile.dm"
-<<<<<<< HEAD
 #include "code\modules\projectiles\projectile_ch.dm"
-=======
 #include "code\modules\projectiles\ammunition\ammo_boxes.dm"
->>>>>>> 1432ca2b223... Merge pull request #12253 from GhostActual/Donk-Co.-Toys
 #include "code\modules\projectiles\ammunition\magazines.dm"
 #include "code\modules\projectiles\ammunition\magazines_vr.dm"
 #include "code\modules\projectiles\ammunition\magazines_yw.dm"
@@ -3775,11 +3772,8 @@
 #include "code\modules\projectiles\guns\magic.dm"
 #include "code\modules\projectiles\guns\modular_guns.dm"
 #include "code\modules\projectiles\guns\projectile.dm"
-<<<<<<< HEAD
 #include "code\modules\projectiles\guns\projectile_ch.dm"
-=======
 #include "code\modules\projectiles\guns\toy.dm"
->>>>>>> 1432ca2b223... Merge pull request #12253 from GhostActual/Donk-Co.-Toys
 #include "code\modules\projectiles\guns\vox.dm"
 #include "code\modules\projectiles\guns\energy\bsharpoon_vr.dm"
 #include "code\modules\projectiles\guns\energy\crestrose_vr.dm"