From d2d9f65a031d55f25bec6ff67320972ef85ef563 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 28 Feb 2021 17:57:38 -0500
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index 1b774914668..1b3d495826a 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2587,11 +2587,8 @@
 #include "code\modules\mob\living\carbon\human\human_defines.dm"
 #include "code\modules\mob\living\carbon\human\human_defines_vr.dm"
 #include "code\modules\mob\living\carbon\human\human_helpers.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\modules\mob\living\carbon\human\human_helpers_vr.dm"
-=======
 #include "code\modules\mob\living\carbon\human\human_modular_limbs.dm"
->>>>>>> c31a3e7... Merge pull request #7905 from MistakeNot4892/beepboop:polaris.dme
 #include "code\modules\mob\living\carbon\human\human_movement.dm"
 #include "code\modules\mob\living\carbon\human\human_organs.dm"
 #include "code\modules\mob\living\carbon\human\human_powers.dm"