From de8ef9709bbc04792da4be4ee3654e9964eed273 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 28 Aug 2020 12:53:47 -0400
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index 8a7e39bdf2c..928765789b9 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1676,14 +1676,9 @@
 #include "code\modules\ai\ai_holder_targeting_vr.dm"
 #include "code\modules\ai\interfaces.dm"
 #include "code\modules\ai\say_list.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm"
 #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm"
 #include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm"
-=======
-#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm"
-#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm"
->>>>>>> 6d4d5d6... Merge pull request #7571 from listerla/nomoresitemanager:polaris.dme
 #include "code\modules\alarm\alarm.dm"
 #include "code\modules\alarm\alarm_handler.dm"
 #include "code\modules\alarm\atmosphere_alarm.dm"