diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-04 16:45:19 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-04 16:45:19 -0400 |
| commit | 607f1a2738911ace1026c6bc14aa28481a898897 (patch) | |
| tree | 91d57d2dca84a42300d11ac6294bf75b4571ab95 /lib | |
| parent | 05389827fd8bc70b1092dc2bae1ed0335536cf4c (diff) | |
| download | nextcloud-server-607f1a2738911ace1026c6bc14aa28481a898897.tar.gz nextcloud-server-607f1a2738911ace1026c6bc14aa28481a898897.zip | |
Fix conflicts with master in lib/base.php
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index e821d78fd8c..4250274c7c3 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'); |