From e96f42a877715fc03b3895d25b07b862055f8690 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 9 Nov 2017 03:16:36 -0600 Subject: [PATCH] Update config.dm --- code/controllers/configuration/entries/config.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/controllers/configuration/entries/config.dm b/code/controllers/configuration/entries/config.dm index bef6809e52..2c7e5c97cf 100644 --- a/code/controllers/configuration/entries/config.dm +++ b/code/controllers/configuration/entries/config.dm @@ -372,8 +372,6 @@ CONFIG_TWEAK(number/mc_tick_rate/ValidateAndSet(str_val)) . = ..() if (.) Master.UpdateTickRate() -<<<<<<< HEAD -======= CONFIG_DEF(flag/resume_after_initializations) @@ -381,4 +379,3 @@ CONFIG_TWEAK(flag/ValidateAndSet(str_val)) . = ..() if(. && Master.current_runlevel) world.sleep_offline = !value ->>>>>>> 73fbac3... Adds a config option to change world.sleep_offline (#32505)