From bf28bee12d47ca18a432838319a2af54e319704e Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 22 Mar 2021 01:36:08 -0400
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index aaaea8c1deb..c7811704c09 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1306,11 +1306,8 @@
 #include "code\game\objects\items\weapons\grenades\spawnergrenade_vr.dm"
 #include "code\game\objects\items\weapons\grenades\supermatter.dm"
 #include "code\game\objects\items\weapons\id cards\cards.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\game\objects\items\weapons\id cards\cards_vr.dm"
-=======
 #include "code\game\objects\items\weapons\id cards\id_stacks.dm"
->>>>>>> 47d2c55... New ID Card Design (#7815):polaris.dme
 #include "code\game\objects\items\weapons\id cards\station_ids.dm"
 #include "code\game\objects\items\weapons\id cards\station_ids_vr.dm"
 #include "code\game\objects\items\weapons\id cards\syndicate_ids.dm"