From bea569958dbe6af390c2b37ec4d5d0691dfa6c03 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 14 Jan 2021 10:01:32 -0500
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index 3406d36cbc9..5d1aabd37b8 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3799,7 +3799,6 @@
 #include "code\ZAS\Zone.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
-<<<<<<< HEAD:vorestation.dme
 #include "maps\gateway_archive_vr\blackmarketpackers.dm"
 #include "maps\offmap_vr\om_ships\abductor.dm"
 #include "maps\southern_cross\items\clothing\sc_accessory.dm"
@@ -3808,9 +3807,6 @@
 #include "maps\southern_cross\loadout\loadout_head.dm"
 #include "maps\southern_cross\loadout\loadout_suit.dm"
 #include "maps\southern_cross\loadout\loadout_uniform.dm"
-=======
-#include "maps\southern_cross\southern_cross.dm"
->>>>>>> 236524a... Merge pull request #7824 from Mechoid/FixSheetRecipes:polaris.dme
 #include "maps\submaps\_helpers.dm"
 #include "maps\submaps\_readme.dm"
 #include "maps\submaps\engine_submaps\engine.dm"