mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove missed stuff from merge

This commit is contained in:
josh4trunks 2014-04-03 22:17:31 -07:00
parent 5b402aa846
commit 2d9b46e3b9
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.sample.php
View File

@ -178,12 +178,9 @@ $CONFIG = array(
/* Enable or disable the logging of IP addresses in case of webform auth failures */ /* Enable or disable the logging of IP addresses in case of webform auth failures */
"log_authfailip" => false, "log_authfailip" => false,
<<<<<<< HEAD
/* Whether ownCloud should log the last successfull cron exec */ /* Whether ownCloud should log the last successfull cron exec */
"cron_log" => true, "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. * 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 * This rotates the current owncloud logfile to a new name, this way the total log usage