summaryrefslogtreecommitdiffstats
path: root/apps/calendar/ajax/event/delete.php
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-04-15 12:43:07 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-04-15 12:43:07 +0200
commite292b1fcdbe15d3a048c89f1825cb9ae8831edbb (patch)
treea310b840389eff1f324b68c3ed3a002b0bb963e7 /apps/calendar/ajax/event/delete.php
parente256ac8791eedcb3dcab1ade0927f1831e24d2e2 (diff)
parenta6a8e2c553bd2ba82c3d50f147a49793ed62b6f5 (diff)
downloadnextcloud-server-e292b1fcdbe15d3a048c89f1825cb9ae8831edbb.tar.gz
nextcloud-server-e292b1fcdbe15d3a048c89f1825cb9ae8831edbb.zip
fix merge conflicts
Diffstat (limited to 'apps/calendar/ajax/event/delete.php')
-rw-r--r--apps/calendar/ajax/event/delete.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/calendar/ajax/event/delete.php b/apps/calendar/ajax/event/delete.php
index 6307e1a0f27..fd7b709393a 100644
--- a/apps/calendar/ajax/event/delete.php
+++ b/apps/calendar/ajax/event/delete.php
@@ -17,4 +17,4 @@ if($access != 'owner' && $access != 'rw'){
exit;
}
$result = OC_Calendar_Object::delete($id);
-OC_JSON::success(); \ No newline at end of file
+OC_JSON::success();