From c072392f22a3dccbb35d3de2ecf46875be15e065 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Fri, 30 Apr 2021 01:54:47 -0400 Subject: [PATCH] Update vorestation.dme --- vorestation.dme | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/vorestation.dme b/vorestation.dme index dc5b8c2658..52a5485718 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2191,12 +2191,8 @@ #include "code\modules\economy\ATM.dm" #include "code\modules\economy\cash.dm" #include "code\modules\economy\cash_register.dm" -<<<<<<< HEAD #include "code\modules\economy\casinocash_ch.dm" -||||||| parent of d9937399de... Merge pull request #10192 from VOREStation/upstream-merge-8022 -======= #include "code\modules\economy\coins.dm" ->>>>>>> d9937399de... Merge pull request #10192 from VOREStation/upstream-merge-8022 #include "code\modules\economy\economy_misc.dm" #include "code\modules\economy\EFTPOS.dm" #include "code\modules\economy\Events.dm" @@ -2572,20 +2568,7 @@ #include "code\modules\maps\tg\reader.dm" #include "code\modules\materials\fifty_spawner.dm" #include "code\modules\materials\fifty_spawner_mats.dm" -<<<<<<< HEAD -#include "code\modules\materials\material_recipes.dm" -#include "code\modules\materials\material_recipes_ch.dm" -#include "code\modules\materials\material_recipes_vr.dm" -#include "code\modules\materials\material_sheets.dm" -#include "code\modules\materials\material_sheets_vr.dm" -||||||| parent of d9937399de... Merge pull request #10192 from VOREStation/upstream-merge-8022 -#include "code\modules\materials\material_recipes.dm" -#include "code\modules\materials\material_recipes_vr.dm" -#include "code\modules\materials\material_sheets.dm" -#include "code\modules\materials\material_sheets_vr.dm" -======= #include "code\modules\materials\fifty_spawner_mats_vr.dm" ->>>>>>> d9937399de... Merge pull request #10192 from VOREStation/upstream-merge-8022 #include "code\modules\materials\material_synth.dm" <<<<<<< HEAD #include "code\modules\materials\materials.dm"