From 607f1a2738911ace1026c6bc14aa28481a898897 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 4 Jul 2011 16:45:19 -0400 Subject: [PATCH] Fix conflicts with master in lib/base.php --- lib/base.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/base.php b/lib/base.php index e821d78fd8..4250274c7c 100644 --- a/lib/base.php +++ b/lib/base.php @@ -84,12 +84,9 @@ require_once('appconfig.php'); require_once('files.php'); require_once('filesystem.php'); require_once('filestorage.php'); -<<<<<<< HEAD require_once('apps/files_sharing/sharedstorage.php'); -======= require_once('l10n.php'); require_once('preferences.php'); ->>>>>>> master require_once('log.php'); require_once('user.php'); require_once('group.php');