cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Missed a merge conflict marker

Browse Source
This commit is contained in:
Aronai Sieyes
2020-03-15 15:24:05 -04:00
parent 9bbfd211a3
commit 836a47fb2d
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/admin/admin_verbs.dm
View File

@@ -493,10 +493,7 @@ var/list/admin_verbs_event_manager = list(
/client/proc/cmd_debug_del_all, /client/proc/cmd_debug_del_all,
/client/proc/toggle_random_events, /client/proc/toggle_random_events,
/client/proc/modify_server_news /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() /client/proc/add_admin_verbs()
if(holder) if(holder)