From 4a2d9f82a10c6a67d6d9fca914cc60c85b7d994c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 7 Oct 2017 23:06:35 -0500 Subject: [PATCH] Update config.dm --- code/controllers/configuration/entries/config.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/controllers/configuration/entries/config.dm b/code/controllers/configuration/entries/config.dm index 9da8e0105c..729370c18b 100644 --- a/code/controllers/configuration/entries/config.dm +++ b/code/controllers/configuration/entries/config.dm @@ -350,9 +350,6 @@ CONFIG_DEF(number/error_msg_delay) // How long to wait between messaging admins CONFIG_DEF(flag/irc_announce_new_game) -<<<<<<< HEAD -CONFIG_DEF(flag/debug_admin_hrefs) -======= CONFIG_DEF(flag/debug_admin_hrefs) CONFIG_DEF(number/mc_tick_rate/base_mc_tick_rate) @@ -376,4 +373,3 @@ CONFIG_TWEAK(number/mc_tick_rate/ValidateAndSet(str_val)) . = ..() if (.) Master.UpdateTickRate() ->>>>>>> 119f3fa... Allows editing config.allow_admin_ooccolor (#31371)