From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 15 Jun 2012 09:48:26 +0000 (+0200)
Subject: fix merge conflicts
X-Git-Tag: v4.5.0beta1~74^2~407^2~20
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4767c705782786f1682ebef1c4d726ac3a4fb5f5;p=nextcloud-server.git

fix merge conflicts
---

4767c705782786f1682ebef1c4d726ac3a4fb5f5
diff --cc apps/calendar/lib/calendar.php
index 9af5c0ca81c,0a54e7a32a6..b725898858d
--- a/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;
  	}