From d9f2e5dd079631086c553a01879343ac2956f23c Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 25 Aug 2020 20:37:53 -0400
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index d4781c5c08..693ca50376 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3230,11 +3230,8 @@
 #include "code\modules\projectiles\projectile\bullets_vr.dm"
 #include "code\modules\projectiles\projectile\change.dm"
 #include "code\modules\projectiles\projectile\energy.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\modules\projectiles\projectile\energy_vr.dm"
-=======
 #include "code\modules\projectiles\projectile\explosive.dm"
->>>>>>> 7595e09... Merge pull request #7474 from lbnesquik/Kot-Mecha-missile-tweak:polaris.dme
 #include "code\modules\projectiles\projectile\force.dm"
 #include "code\modules\projectiles\projectile\hook.dm"
 #include "code\modules\projectiles\projectile\magnetic.dm"