From 94a7b22673bbf283e774d4e4433e7e1287d8bdcd Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 3 Apr 2021 04:14:20 -0400
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index d909ae1f65..19246b8e17 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3376,13 +3376,6 @@
 #include "code\modules\planet\planet.dm"
 #include "code\modules\planet\sif.dm"
 #include "code\modules\planet\time.dm"
-<<<<<<< HEAD
-||||||| parent of 646a706f22... Merge pull request #9589 from Very-Soft/makebeachcool
-#include "code\modules\planet\virgo3b_vr.dm"
-=======
-#include "code\modules\planet\virgo3b_vr.dm"
-#include "code\modules\planet\virgo4_vr.dm"
->>>>>>> 646a706f22... Merge pull request #9589 from Very-Soft/makebeachcool
 #include "code\modules\planet\weather.dm"
 #include "code\modules\power\apc.dm"
 #include "code\modules\power\apc_vr.dm"