From f1f6ecf481d465d3b066a33ee1618cc3e2bf2ce6 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 28 Aug 2022 20:53:22 -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 cb2ebfb404..484248be8e 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3442,11 +3442,8 @@
 #include "code\modules\mob\new_player\sprite_accessories_taur_vr.dm"
 #include "code\modules\mob\new_player\sprite_accessories_vr.dm"
 #include "code\modules\mob\new_player\sprite_accessories_wing.dm"
-<<<<<<< HEAD
 #include "code\modules\mob\new_player\sprite_accessories_wing_ch.dm"
-=======
 #include "code\modules\mob\new_player\sprite_accessories_wing_large_vr.dm"
->>>>>>> 124841bd3a... Merge pull request #13598 from Heroman3003/megawings
 #include "code\modules\mob\new_player\sprite_accessories_wing_vr.dm"
 #include "code\modules\mob\new_player\sprite_accessories_yw.dm"
 #include "code\modules\modular_computers\laptop_vendor.dm"