From: josh4trunks <joshruehlig@gmail.com>
Date: Fri, 4 Apr 2014 05:17:31 +0000 (-0700)
Subject: Remove missed stuff from merge
X-Git-Tag: v7.0.0alpha2~337^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2d9b46e3b9dc2ceb8e21c23a905891aa9c33151e;p=nextcloud-server.git

Remove missed stuff from merge
---

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