diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-01-28 11:18:04 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-28 11:18:04 +0100 |
| commit | 8067a1394e3dab551e65ec8abd12e673a811bf40 (patch) | |
| tree | fd18fac68c7ca62ee50142e771f0da70a9c0925d /apps/files/admin.php | |
| parent | dbb0d0407324830f4a7ff51781c535c1cb0d2a06 (diff) | |
| parent | 857b15db3739fe8fbbad4df0f10e9b48ba1f90c2 (diff) | |
| download | nextcloud-server-8067a1394e3dab551e65ec8abd12e673a811bf40.tar.gz nextcloud-server-8067a1394e3dab551e65ec8abd12e673a811bf40.zip | |
fix merge conflicts
Diffstat (limited to 'apps/files/admin.php')
| -rw-r--r-- | apps/files/admin.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/apps/files/admin.php b/apps/files/admin.php index f747f8645f6..02c3147dba5 100644 --- a/apps/files/admin.php +++ b/apps/files/admin.php @@ -21,10 +21,6 @@ * */ - -// Init owncloud - - OCP\User::checkAdminUser(); $htaccessWorking=(getenv('htaccessWorking')=='true'); |