From dd5ab8ba28349363dd6cb0ca120a0216f58b5ed2 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 4 Jul 2020 08: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 03554023826..fe1a54bba83 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1647,14 +1647,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"
->>>>>>> 21d0112... ice cream 2: electric boogaloo (#7319):polaris.dme
 #include "code\modules\alarm\alarm.dm"
 #include "code\modules\alarm\alarm_handler.dm"
 #include "code\modules\alarm\atmosphere_alarm.dm"