From c66cd083e4e1e8b5cb327310ca54a9607f8f3cf5 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 24 Jan 2021 01:48:48 -0500
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index 2caf2061854..effeef8fc06 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3798,7 +3798,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"
@@ -3807,9 +3806,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"
->>>>>>> 692a8c2... Fixes dark click catcher (#7803):polaris.dme
 #include "maps\submaps\_helpers.dm"
 #include "maps\submaps\_readme.dm"
 #include "maps\submaps\engine_submaps\engine.dm"