From 148241a62ea0ca3d82e32fcbe652f95248d4ff25 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Tue, 19 Jul 2022 20:48:11 -0400
Subject: [PATCH] powder that makes you say yes

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

diff --git a/vorestation.dme b/vorestation.dme
index 5abd5b4625..1d12d4b2fb 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4453,29 +4453,21 @@
 #include "maps\atoll\atoll_objs.dm"
 #include "maps\atoll\atoll_turfs.dm"
 #include "maps\gateway_archive_vr\blackmarketpackers.dm"
-<<<<<<< HEAD
 #include "maps\southern_cross\southern_cross.dm"
 #include "maps\southern_cross\items\encryptionkey_sc.dm"
 #include "maps\southern_cross\items\headset_sc.dm"
-=======
-#include "maps\groundbase\groundbase.dm"
-#include "maps\offmap_vr\om_ships\abductor.dm"
->>>>>>> 3c288de197... Merge pull request #13353 from Very-Soft/backtogb
 #include "maps\southern_cross\items\clothing\sc_accessory.dm"
 #include "maps\southern_cross\items\clothing\sc_suit.dm"
 #include "maps\southern_cross\items\clothing\sc_under.dm"
 #include "maps\southern_cross\loadout\loadout_suit.dm"
 #include "maps\southern_cross\loadout\loadout_uniform.dm"
 #include "maps\southern_cross\loadout\loadout_vr.dm"
-<<<<<<< HEAD
 #include "maps\southern_cross\overmap\shuttles.dm"
 #include "maps\southern_cross\structures\closets\engineering.dm"
 #include "maps\southern_cross\structures\closets\medical.dm"
 #include "maps\southern_cross\structures\closets\misc.dm"
 #include "maps\southern_cross\structures\closets\research.dm"
 #include "maps\southern_cross\structures\closets\security.dm"
-=======
->>>>>>> 3c288de197... Merge pull request #13353 from Very-Soft/backtogb
 #include "maps\submaps\_helpers.dm"
 #include "maps\submaps\_readme.dm"
 #include "maps\submaps\engine_submaps\engine.dm"