From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 13 Jun 2012 09:40:00 +0000 (+0200)
Subject: fix merge conflicts
X-Git-Tag: v4.5.0beta1~74^2~407^2~27
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9bdad6fdbf41ef1580e0830ce796bf8eeee90363;p=nextcloud-server.git

fix merge conflicts
---

9bdad6fdbf41ef1580e0830ce796bf8eeee90363
diff --cc apps/calendar/appinfo/version
index ea2303bc03f,267577d47e4..2eb3c4fe4ee
--- a/apps/calendar/appinfo/version
+++ b/apps/calendar/appinfo/version
@@@ -1,1 -1,1 +1,1 @@@
- 0.5
 -0.4.1
++0.5