Fixed merge conflict

Former-commit-id: bd98cc80ad87b840a60c2548667352f5c6041c55
This commit is contained in:
Luis Calvo 2019-05-13 15:15:14 +02:00
parent 895588ebe0
commit 14717a6c6d
1 changed files with 6 additions and 0 deletions

View File

@ -67,6 +67,12 @@ $table_remote->class = 'databox filters';
$table_remote->size['name'] = '30%'; $table_remote->size['name'] = '30%';
$table_remote->style['name'] = 'font-weight: bold'; $table_remote->style['name'] = 'font-weight: bold';
// Enable eHorus user configuration.
$row = [];
$row['name'] = ('Enable eHorus user configuration');
$row['control'] = html_print_checkbox_switch('ehorus_user_login', 1, $config['ehorus_user_login'], true);
$table_remote->data['ehorus_user_login'] = $row;
// User. // User.
$row = []; $row = [];
$row['name'] = __('User'); $row['name'] = __('User');