From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 7 May 2012 09:47:14 +0000 (+0200)
Subject: fix merge conflicts
X-Git-Tag: v4.0.0beta~1^2~16^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3;p=nextcloud-server.git

fix merge conflicts
---

46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3
diff --cc apps/files/appinfo/remote.php
index 0f618c391ad,defb97ab152..94ae101bb00
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@@ -22,11 -22,12 +22,9 @@@
   * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
   *
   */
--
 -// Do not load FS ...
 -$RUNTIME_NOSETUPFS = true;
  // only need filesystem apps
  $RUNTIME_APPTYPES=array('filesystem','authentication');
- 
-  
+ require_once('../lib/base.php');
  
  // Backends
  $authBackend = new OC_Connector_Sabre_Auth();