From d43a352ff89d0d42596e41d7ab89ba2ac5fed0b0 Mon Sep 17 00:00:00 2001
From: Spades <SpadesNeil@users.noreply.github.com>
Date: Sat, 5 Jan 2019 08:24:43 -0500
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index d6659cb29a..822c6ddb44 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -52,12 +52,9 @@
 #include "code\__defines\misc.dm"
 #include "code\__defines\misc_vr.dm"
 #include "code\__defines\mobs.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\__defines\mobs_vr.dm"
 #include "code\__defines\nifsoft.dm"
-=======
 #include "code\__defines\objects.dm"
->>>>>>> 05e9dae... Merge pull request #5714 from Mechoid/The_story_so_far_In_the_beginning_the_grippers_were_created_This_has_made_a_lot_of_people_very_angry_and_was_widely_regarded_as_a_bad_move:polaris.dme
 #include "code\__defines\planets.dm"
 #include "code\__defines\process_scheduler.dm"
 #include "code\__defines\qdel.dm"