From e76f319faaf2830df65e7669fab6e1ec5eff382c Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 31 Aug 2020 19:20:30 -0400
Subject: [PATCH] Update vorestation.dme

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

diff --git a/vorestation.dme b/vorestation.dme
index 9dc5cab5d87..9c23422ab37 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1864,11 +1864,8 @@
 #include "code\modules\clothing\masks\breath.dm"
 #include "code\modules\clothing\masks\breath_vr.dm"
 #include "code\modules\clothing\masks\gasmask.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\modules\clothing\masks\gasmask_vr.dm"
-=======
 #include "code\modules\clothing\masks\hailer.dm"
->>>>>>> cc3591c... Merge pull request #7552 from SplinterGP/master:polaris.dme
 #include "code\modules\clothing\masks\miscellaneous.dm"
 #include "code\modules\clothing\masks\voice.dm"
 #include "code\modules\clothing\rings\material.dm"