Update config.dm

This commit is contained in:
LetterJay
2017-11-09 03:16:36 -06:00
committed by GitHub
parent 146dfe33ea
commit e96f42a877

View File

@@ -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)