From 2d9b46e3b9dc2ceb8e21c23a905891aa9c33151e Mon Sep 17 00:00:00 2001
From: josh4trunks <joshruehlig@gmail.com>
Date: Thu, 3 Apr 2014 22:17:31 -0700
Subject: [PATCH] Remove missed stuff from merge

---
 config/config.sample.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 8430b8d653..92b534d43d 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
-- 
GitLab