From 3f19eafeaa63ee286685296b0bc888933ea283fa Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 13 May 2021 15:03:20 -0400
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index b8ff6a2e893..2a8c70962ce 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3821,7 +3821,6 @@
 #include "code\modules\virus2\helpers.dm"
 #include "code\modules\virus2\isolator.dm"
 #include "code\modules\virus2\items_devices.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\modules\vore\hook-defs_vr.dm"
 #include "code\modules\vore\trycatch_vr.dm"
 #include "code\modules\vore\appearance\preferences_vr.dm"
@@ -3852,7 +3851,6 @@
 #include "code\modules\vore\resizing\sizegun_vr.dm"
 #include "code\modules\vore\smoleworld\smoleworld_vr.dm"
 #include "code\modules\vore\weight\fitness_machines_vr.dm"
-=======
 #include "code\modules\webhooks\_webhook.dm"
 #include "code\modules\webhooks\webhook_ahelp2discord.dm"
 #include "code\modules\webhooks\webhook_custom_event.dm"
@@ -3860,7 +3858,6 @@
 #include "code\modules\webhooks\webhook_roundend.dm"
 #include "code\modules\webhooks\webhook_roundprep.dm"
 #include "code\modules\webhooks\webhook_roundstart.dm"
->>>>>>> 4deffc7... Ports Nebula's Discord Webhook Integration (#8071):polaris.dme
 #include "code\modules\xenoarcheaology\anomaly_container.dm"
 #include "code\modules\xenoarcheaology\boulder.dm"
 #include "code\modules\xenoarcheaology\effect.dm"