fix merge conflicts

diff --cc apps/calendar/ajax/events.php
Simple merge

diff --cc apps/calendar/lib/app.php
Simple merge

diff --cc apps/calendar/lib/calendar.php
index 9af5c0ca81cad1c30136aaca59ac4b080759d1e1,0a54e7a32a6cd40a5010bd3eba91ff12c97bb0de..b725898858d8ba9277a19f5ff7ba4968bae76757
--- 1/apps/calendar/lib/calendar.php
--- 2/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@@ -205,7 -198,9 +205,10 @@@ class OC_Calendar_Calendar
                $stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE calendarid = ?' );
                $stmt->execute(array($id));
  
 +              OCP\Util::emitHook('OC_Calendar', 'deleteCalendar', $id);
+               if(count(self::allCalendars()) == 0) {
+                       self::addCalendar(OCP\USER::getUser(),'Default calendar');
+               }
  
                return true;
        }