fix merge conflicts

diff --cc apps/files/appinfo/remote.php
index 0f618c391ad19c5998eb08ca8a7e1bbf1987186a,defb97ab152ef8ed451661884c94bcb141e2e81b..94ae101bb00ad522925d4a174a201ddc102d1062
--- 1/apps/files/appinfo/remote.php
--- 2/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();