diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-09-13 10:32:35 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-09-13 10:32:35 +0000 |
| commit | 182f890110f86ced32177dde2ac2fc2437bb2305 (patch) | |
| tree | 86de56d222a06b075308487c183f1ac406d88c97 /lib | |
| parent | a0452180b05388b5c31f2cbab9e53c542f3b8cc2 (diff) | |
| download | nextcloud-server-182f890110f86ced32177dde2ac2fc2437bb2305.tar.gz nextcloud-server-182f890110f86ced32177dde2ac2fc2437bb2305.zip | |
Remove a merge conflict
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/base.php b/lib/base.php index c7f6fd8ad85..0da33b4d0ff 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'); |