Remove missed stuff from merge

11 years ago · 2d9b46e3b9
parent 5b402aa846
commit 2d9b46e3b9
1 changed files with 0 additions and 3 deletions
--- 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