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

fix webdav, bloody merge conflicts
---

diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 94ae101bb00..465e0c0a935 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -24,7 +24,6 @@
  */
 // only need filesystem apps
 $RUNTIME_APPTYPES=array('filesystem','authentication');
-require_once('../lib/base.php');
 
 // Backends
 $authBackend = new OC_Connector_Sabre_Auth();