From 836a47fb2d2473a96185d3b1b3bb9d4565c48ea2 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 15 Mar 2020 15:24:05 -0400 Subject: [PATCH] Missed a merge conflict marker --- code/modules/admin/admin_verbs.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 2636a4c4314..54cb62b28e6 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -493,10 +493,7 @@ var/list/admin_verbs_event_manager = list( /client/proc/cmd_debug_del_all, /client/proc/toggle_random_events, /client/proc/modify_server_news - ->>>>>>> 0021a3b... Merge pull request #6818 from Neerti/event_manager_fix_electric_boogaloo ) -//VOREStation Edit End /client/proc/add_admin_verbs() if(holder)