Skip to content
Snippets Groups Projects
Commit 2d9b46e3 authored by josh4trunks's avatar josh4trunks
Browse files

Remove missed stuff from merge

parent 5b402aa8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
config/config.sample.php
+ 0
− 3
View file @ 2d9b46e3
...@@ -178,12 +178,9 @@ $CONFIG = array( ...@@ -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
......
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