From 842f3a63ae9d7b7a0b31eefa6ab14b7af82b5bb2 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 13 May 2019 22:42:45 -0400
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index 432353a8be3..d5af176d120 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -218,10 +218,7 @@
 #include "code\controllers\subsystems\air.dm"
 #include "code\controllers\subsystems\airflow.dm"
 #include "code\controllers\subsystems\atoms.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\controllers\subsystems\bellies_vr.dm"
-=======
->>>>>>> 59c8446... Merge pull request #6164 from Novacat/nova-runtimes:polaris.dme
 #include "code\controllers\subsystems\character_setup.dm"
 #include "code\controllers\subsystems\circuits.dm"
 #include "code\controllers\subsystems\events.dm"