fix webdav, bloody merge conflicts

diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 94ae101bb00ad522925d4a174a201ddc102d1062..465e0c0a93556d7ff6035a5d0ba2324951dc533e 100644 (file)
--- 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();