From 14f0f21c882acf9fc1547e76f97d07b904b05bd0 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 13 May 2018 09:53:04 -0500 Subject: [PATCH] Update chat_commands.dm --- code/modules/admin/chat_commands.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm index ef90adb463..dbeb6fce7f 100644 --- a/code/modules/admin/chat_commands.dm +++ b/code/modules/admin/chat_commands.dm @@ -103,13 +103,8 @@ GLOBAL_LIST(round_end_notifiees) var/list/text_res = results.Copy(1, 3) var/list/refs = results.len > 3 ? results.Copy(4) : null . = "[text_res.Join("\n")][refs ? "\nRefs: [refs.Join(" ")]" : ""]" -<<<<<<< HEAD - -/datum/server_tools_command/reload_admins -======= /datum/tgs_chat_command/reload_admins ->>>>>>> 575d098... Update DMAPI to version 3.2.1.0 (#37429) name = "reload_admins" help_text = "Forces the server to reload admins." admin_only = TRUE