Commit 79fb1a92 authored by Evan Goldenberg's avatar Evan Goldenberg
Browse files

repair some damage done by my really bad merging skills

Signed-off-by: default avatarEvan Goldenberg <>
parent 4e257374
......@@ -253,6 +253,7 @@ $siteoptionform = array(
'title' => get_string('userscanhiderealnames', 'admin'),
'description' => get_string('userscanhiderealnamesdescription', 'admin'),
'defaultvalue' => get_config('userscanhiderealnames'),
'antispam' => array(
'type' => 'select',
'title' => get_string('antispam', 'admin'),
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment