summaryrefslogtreecommitdiffstats
path: root/apps/calendar/ajax/import/dialog.php
diff options
context:
space:
mode:
authorTom Needham <needham.thomas@gmail.com>2012-07-26 11:26:22 +0000
committerTom Needham <needham.thomas@gmail.com>2012-07-26 11:26:22 +0000
commitedb04b25dea733e0ac3a1f87c55cfd368dcdf731 (patch)
treee8b951b8162955d7f2282c83d06cf803e61396f3 /apps/calendar/ajax/import/dialog.php
parent7de97ed20003d1f5ab9e2bfde9386bba07d0eff8 (diff)
parentb3848581bf5f77008a71cf79ba6e3d61b33baed6 (diff)
downloadnextcloud-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.php2
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');