From dc36863e27401452adb6874da010dbb70188a0d1 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 24 Nov 2019 17:28:23 -0500
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index 049a3b8decb..a46f3300371 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2392,21 +2392,15 @@
 #include "code\modules\mob\living\silicon\robot\drone\drone_items.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_say.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\modules\mob\living\silicon\robot\drone\drone_vr.dm"
-=======
 #include "code\modules\mob\living\silicon\robot\drone\swarm.dm"
 #include "code\modules\mob\living\silicon\robot\drone\swarm_abilities.dm"
 #include "code\modules\mob\living\silicon\robot\drone\swarm_items.dm"
->>>>>>> 7ecdcb4... Security / PseudoCargo Expansion (#6482):polaris.dme
 #include "code\modules\mob\living\silicon\robot\robot_modules\event.dm"
 #include "code\modules\mob\living\silicon\robot\robot_modules\event_vr.dm"
 #include "code\modules\mob\living\silicon\robot\robot_modules\station.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\modules\mob\living\silicon\robot\robot_modules\station_vr.dm"
-=======
 #include "code\modules\mob\living\silicon\robot\robot_modules\swarm.dm"
->>>>>>> 7ecdcb4... Security / PseudoCargo Expansion (#6482):polaris.dme
 #include "code\modules\mob\living\silicon\robot\robot_modules\syndicate.dm"
 #include "code\modules\mob\living\silicon\robot\subtypes\gravekeeper.dm"
 #include "code\modules\mob\living\silicon\robot\subtypes\lost_drone.dm"