mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix conflicts with master in lib/base.php

This commit is contained in:
Michael Gapczynski 2011-07-04 16:45:19 -04:00
parent 05389827fd
commit 607f1a2738
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/base.php
View File

@ -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');