diff options
author | Tom Needham <needham.thomas@gmail.com> | 2012-07-26 11:26:22 +0000 |
---|---|---|
committer | Tom Needham <needham.thomas@gmail.com> | 2012-07-26 11:26:22 +0000 |
commit | edb04b25dea733e0ac3a1f87c55cfd368dcdf731 (patch) | |
tree | e8b951b8162955d7f2282c83d06cf803e61396f3 /apps/calendar/ajax/import/dialog.php | |
parent | 7de97ed20003d1f5ab9e2bfde9386bba07d0eff8 (diff) | |
parent | b3848581bf5f77008a71cf79ba6e3d61b33baed6 (diff) | |
download | nextcloud-server-edb04b25dea733e0ac3a1f87c55cfd368dcdf731.tar.gz nextcloud-server-edb04b25dea733e0ac3a1f87c55cfd368dcdf731.zip |
Fix merge conflicts
Diffstat (limited to 'apps/calendar/ajax/import/dialog.php')
-rw-r--r-- | apps/calendar/ajax/import/dialog.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php index b99c32278c4..18fe226172c 100644 --- a/apps/calendar/ajax/import/dialog.php +++ b/apps/calendar/ajax/import/dialog.php @@ -5,8 +5,6 @@ * later. * See the COPYING-README file. */ - - OCP\JSON::checkLoggedIn(); OCP\App::checkAppEnabled('calendar'); $tmpl = new OCP\Template('calendar', 'part.import'); |