diff options
Diffstat (limited to 'config')
| -rwxr-xr-x | config/config.sample.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 8430b8d6539..92b534d43de 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -178,12 +178,9 @@ $CONFIG = array( /* Enable or disable the logging of IP addresses in case of webform auth failures */ "log_authfailip" => false, -<<<<<<< HEAD /* Whether ownCloud should log the last successfull cron exec */ "cron_log" => true, -======= ->>>>>>> Fixes login / logout when HTTP Basic Headers are avilable. /* * Configure the size in bytes log rotation should happen, 0 or false disables the rotation. * This rotates the current owncloud logfile to a new name, this way the total log usage |