cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflict, accept active seromi_vr, deactivate seromi_yw.dm

Browse Source
This commit is contained in:
Razgriz
2020-11-21 00:20:34 -07:00
committed by GitHub
parent 2e15527ef0
commit 03ccdbcba9
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vorestation.dme
-5
View File
@@ -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"