From 010390191c22c5d4d858d037b6fc2724afd2156e Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 6 Feb 2022 19:49:36 -0500
Subject: [PATCH] powder that makes you say yes

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

diff --git a/vorestation.dme b/vorestation.dme
index e8126ceb7d..1f5811be02 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4415,15 +4415,12 @@
 #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"
-=======
->>>>>>> de1f9190b8b... Merge pull request #12143 from Very-Soft/returntotether
 #include "maps\submaps\_helpers.dm"
 #include "maps\submaps\engine_submaps\engine.dm"
 #include "maps\submaps\engine_submaps\engine_areas.dm"
@@ -4438,6 +4435,5 @@
 #include "maps\submaps\surface_submaps\plains\plains_areas.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
-#include "maps\tether\tether.dm"
 #include "maps\~map_system\maps.dm"
 // END_INCLUDE