From cc2b7e30c036a7c34ec2a38c7067dafcebc3c710 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 13 Jul 2019 23:01:19 -0400
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index 0588fe8d9b8..943cc3f5154 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2030,11 +2030,8 @@
 #include "code\modules\mining\machine_stacking.dm"
 #include "code\modules\mining\machine_unloading.dm"
 #include "code\modules\mining\mine_items.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\modules\mining\mine_items_vr.dm"
-=======
 #include "code\modules\mining\mine_outcrops.dm"
->>>>>>> 887804e... Merge pull request #6245 from Ketrai/ROCKSDOJUSTROCK:polaris.dme
 #include "code\modules\mining\mine_turfs.dm"
 #include "code\modules\mining\mine_turfs_vr.dm"
 #include "code\modules\mining\mineral_effect.dm"