mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove a merge conflict

This commit is contained in:
Tom Needham 2012-09-13 10:32:35 +00:00
parent a0452180b0
commit 182f890110
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/base.php
View File

@ -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');