cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 21:49:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update vorestation.dme

Browse Source
This commit is contained in:
Novacat
2021-03-09 15:56:33 -05:00
committed by GitHub
parent 7fcb6e2f1a
commit a1a826e562
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vorestation.dme
-3
View File
@@ -328,11 +328,8 @@
#include "code\datums\autolathe\engineering.dm"
#include "code\datums\autolathe\engineering_vr.dm"
#include "code\datums\autolathe\general.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\datums\autolathe\general_vr.dm"
=======
#include "code\datums\autolathe\materials.dm"
>>>>>>> 1de8bc1... Industrial Expansion (#7811):polaris.dme
#include "code\datums\autolathe\medical.dm"
#include "code\datums\autolathe\medical_vr.dm"
#include "code\datums\autolathe\tools.dm"