From a1a826e562b7ae8bbaf96bdad74d932e05902da9 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 9 Mar 2021 15:56:33 -0500
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index f23f62a0f1a..bd0497b19e7 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -328,11 +328,8 @@
 #include "code\datums\autolathe\engineering.dm"
 #include "code\datums\autolathe\engineering_vr.dm"
 #include "code\datums\autolathe\general.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\datums\autolathe\general_vr.dm"
-=======
 #include "code\datums\autolathe\materials.dm"
->>>>>>> 1de8bc1... Industrial Expansion (#7811):polaris.dme
 #include "code\datums\autolathe\medical.dm"
 #include "code\datums\autolathe\medical_vr.dm"
 #include "code\datums\autolathe\tools.dm"