From 182f890110f86ced32177dde2ac2fc2437bb2305 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Thu, 13 Sep 2012 10:32:35 +0000
Subject: [PATCH] Remove a merge conflict

---
 lib/base.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index c7f6fd8ad8..0da33b4d0f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -268,7 +268,6 @@ class OC{
 		session_start();
 	}
 
-<<<<<<< HEAD
 	public static function loadapp(){
 		if(file_exists(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php')){
 			require_once(OC_App::getAppPath(OC::$REQUESTEDAPP) . '/index.php');
@@ -304,9 +303,7 @@ class OC{
 	}
 
 	public static function init(){
-=======
-	public static function init() {
->>>>>>> master
+
 		// register autoloader
 		spl_autoload_register(array('OC','autoload'));
 		setlocale(LC_ALL, 'en_US.UTF-8');