diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 12:43:07 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 12:43:07 +0200 |
| commit | e292b1fcdbe15d3a048c89f1825cb9ae8831edbb (patch) | |
| tree | a310b840389eff1f324b68c3ed3a002b0bb963e7 /apps/calendar/ajax/event | |
| parent | e256ac8791eedcb3dcab1ade0927f1831e24d2e2 (diff) | |
| parent | a6a8e2c553bd2ba82c3d50f147a49793ed62b6f5 (diff) | |
| download | nextcloud-server-e292b1fcdbe15d3a048c89f1825cb9ae8831edbb.tar.gz nextcloud-server-e292b1fcdbe15d3a048c89f1825cb9ae8831edbb.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar/ajax/event')
| -rw-r--r-- | apps/calendar/ajax/event/delete.php | 2 | ||||
| -rw-r--r-- | apps/calendar/ajax/event/new.php | 2 |
2 files changed, 1 insertions, 3 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(); diff --git a/apps/calendar/ajax/event/new.php b/apps/calendar/ajax/event/new.php index 59fda79da73..7070bbf05d7 100644 --- a/apps/calendar/ajax/event/new.php +++ b/apps/calendar/ajax/event/new.php @@ -8,8 +8,6 @@ require_once('../../../../lib/base.php'); -$l10n = new OC_L10N('calendar'); - OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); |