fix merge conflicts

apps/calendar/ajax/calendar/activation.php

@@ -20,4 +20,4 @@ $calendar = OC_Calendar_App::getCalendar($calendarid);
 OCP\JSON::success(array(
 	'active' => $calendar['active'],
 	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
+));

apps/calendar/ajax/calendar/delete.php

@@ -21,5 +21,4 @@ if($del == true){
 	OCP\JSON::success();
 }else{
 	OCP\JSON::error(array('error'=>'dberror'));
-}
-?> 
+}

apps/calendar/ajax/calendar/edit.form.php

@@ -17,4 +17,3 @@ $tmpl->assign('new', false);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
 $tmpl->printPage();
-?>

apps/calendar/ajax/calendar/edit.php

@@ -20,5 +20,4 @@ $tmpl = new OCP\Template("calendar", "part.editcalendar");
 $tmpl->assign('new', false);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
-?>
+$tmpl->printPage();

apps/calendar/ajax/calendar/new.form.php

@@ -19,5 +19,4 @@ $tmpl = new OCP\Template('calendar', 'part.editcalendar');
 $tmpl->assign('new', true);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
-?>
+$tmpl->printPage();

apps/calendar/ajax/calendar/new.php

@@ -34,4 +34,4 @@ $tmpl->assign('calendar', $calendar);
 OCP\JSON::success(array(
 	'page' => $tmpl->fetchPage(),
 	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
+));

apps/calendar/ajax/calendar/overview.php

@@ -11,5 +11,4 @@ $l10n = OC_L10N::get('calendar');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
 $output = new OCP\Template("calendar", "part.choosecalendar");
-$output -> printpage();
-?>
+$output -> printpage();

apps/calendar/ajax/calendar/update.php

@@ -39,4 +39,4 @@ $tmpl->assign('calendar', $calendar);
 OCP\JSON::success(array(
 	'page' => $tmpl->fetchPage(),
 	'eventSource' => OC_Calendar_Calendar::getEventSourceInfo($calendar),
-));
+));

apps/calendar/ajax/categories/rescan.php

@@ -39,4 +39,4 @@ if(count($events) == 0) {
 OC_Calendar_App::scanCategories($events);
 $categories = OC_Calendar_App::getCategoryOptions();
 
-OCP\JSON::success(array('data' => array('categories'=>$categories)));
+OCP\JSON::success(array('data' => array('categories'=>$categories)));

apps/calendar/ajax/event/delete.php

@@ -17,4 +17,4 @@ if($access != 'owner' && $access != 'rw'){
 	exit;
 }
 $result = OC_Calendar_Object::delete($id);
-OCP\JSON::success();
+OCP\JSON::success();

apps/calendar/ajax/event/edit.php

@@ -42,5 +42,4 @@ if($errarr){
 		OC_Calendar_Object::moveToCalendar($id, $cal);
 	}
 	OCP\JSON::success();
-}
-?>
+}

apps/calendar/ajax/event/move.php

@@ -43,4 +43,4 @@ $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
 
 $result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
 $lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
+OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));

apps/calendar/ajax/event/new.form.php

@@ -72,4 +72,4 @@ $tmpl->assign('repeat_count', '10');
 $tmpl->assign('repeat_weekofmonth', 'auto');
 $tmpl->assign('repeat_date', '');
 $tmpl->assign('repeat_year', 'bydate');
-$tmpl->printpage();
+$tmpl->printpage();

apps/calendar/ajax/event/new.php

@@ -21,5 +21,4 @@ if($errarr){
 	$vcalendar = OC_Calendar_Object::createVCalendarFromRequest($_POST);
 	$result = OC_Calendar_Object::add($cal, $vcalendar->serialize());
 	OCP\JSON::success();
-}
-?>
+}

apps/calendar/ajax/event/resize.php

@@ -35,4 +35,4 @@ $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
 
 OC_Calendar_Object::edit($id, $vcalendar->serialize());
 $lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();
-OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));
+OCP\JSON::success(array('lastmodified'=>(int)$lastmodified->format('U')));

apps/calendar/ajax/import/dialog.php

@@ -12,5 +12,4 @@ OCP\App::checkAppEnabled('calendar');
 $tmpl = new OCP\Template('calendar', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);
-$tmpl->printpage();
-?>
+$tmpl->printpage();

apps/calendar/ajax/import/import.php

@@ -126,4 +126,4 @@ sleep(3);
 if(is_writable('import_tmp/')){
 	unlink($progressfile);
 }
-OCP\JSON::success();
+OCP\JSON::success();

apps/calendar/ajax/settings/getfirstday.php

@@ -8,5 +8,4 @@
  
 OCP\JSON::checkLoggedIn();
 $firstday = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'firstday', 'mo');
-OCP\JSON::encodedPrint(array('firstday' => $firstday));
-?> 
+OCP\JSON::encodedPrint(array('firstday' => $firstday));

apps/calendar/ajax/settings/guesstimezone.php

@@ -24,4 +24,3 @@ if($timezone == OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timez
 OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timezone', $timezone);
 $message = array('message'=> $l->t('New Timezone:') . $timezone);
 OCP\JSON::success($message);
-?>

apps/calendar/ajax/settings/setfirstday.php

@@ -12,6 +12,4 @@ if(isset($_POST["firstday"])){
 	OCP\JSON::success();
 }else{
 	OCP\JSON::error();
-}
-?> 
- 
+}

apps/calendar/ajax/settings/settimeformat.php

@@ -12,6 +12,4 @@ if(isset($_POST["timeformat"])){
 	OCP\JSON::success();
 }else{
 	OCP\JSON::error();
-}
-?> 
- 
+}

apps/calendar/ajax/settings/settimezone.php

@@ -22,6 +22,4 @@ if( isset( $_POST['timezone'] ) ){
 	OCP\JSON::success(array('data' => array( 'message' => $l->t('Timezone changed') )));
 }else{
 	OCP\JSON::error(array('data' => array( 'message' => $l->t('Invalid request') )));
-}
-
-?>
+}

apps/calendar/ajax/settings/timeformat.php

@@ -8,5 +8,4 @@
  
 OCP\JSON::checkLoggedIn();
 $timeformat = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'timeformat', "24");
-OCP\JSON::encodedPrint(array("timeformat" => $timeformat));
-?> 
+OCP\JSON::encodedPrint(array("timeformat" => $timeformat));