From bf94439e8c8c5ca0598182677ee02c3d7b0cd708 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 6 Feb 2021 20:54:34 -0500
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index 78d28cf8197..ebf03ce86e1 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1701,14 +1701,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"
->>>>>>> 65f48cd... Merge pull request #7845 from Cerebulon/foodfixes:polaris.dme
 #include "code\modules\alarm\alarm.dm"
 #include "code\modules\alarm\alarm_handler.dm"
 #include "code\modules\alarm\atmosphere_alarm.dm"