From 03ccdbcba93de61487f70781f49927d81129cb7d Mon Sep 17 00:00:00 2001
From: Razgriz <razgriz1032@gmail.com>
Date: Sat, 21 Nov 2020 00:20:34 -0700
Subject: [PATCH] Resolve conflict, accept active seromi_vr, deactivate
 seromi_yw.dm

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

diff --git a/vorestation.dme b/vorestation.dme
index 0da4b2539e..409feb5697 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2073,12 +2073,7 @@
 #include "code\modules\clothing\suits\wiz_robe.dm"
 #include "code\modules\clothing\suits\wolfbrigade.dm"
 #include "code\modules\clothing\suits\aliens\seromi.dm"
-<<<<<<< HEAD
-#include "code\modules\clothing\suits\aliens\seromi_yw.dm"
-||||||| parent of 7f84a6ce06... Merge pull request #9312 from KasparoVy/bird-is-the-word
-=======
 #include "code\modules\clothing\suits\aliens\seromi_vr.dm"
->>>>>>> 7f84a6ce06... Merge pull request #9312 from KasparoVy/bird-is-the-word
 #include "code\modules\clothing\suits\aliens\tajara.dm"
 #include "code\modules\clothing\suits\aliens\unathi.dm"
 #include "code\modules\clothing\suits\aliens\vox.dm"