fix merge conflicts

author Georg Ehrke <dev@georgswebsite.de>

Wed, 13 Jun 2012 09:40:00 +0000 (11:40 +0200)

committer Georg Ehrke <dev@georgswebsite.de>

Wed, 13 Jun 2012 09:40:00 +0000 (11:40 +0200)
author Georg Ehrke <dev@georgswebsite.de>
Wed, 13 Jun 2012 09:40:00 +0000 (11:40 +0200)
committer Georg Ehrke <dev@georgswebsite.de>
Wed, 13 Jun 2012 09:40:00 +0000 (11:40 +0200)
diff --cc apps/calendar/appinfo/database.xml
Simple merge
diff --cc apps/calendar/appinfo/version

index ea2303bc03f1fc6e2148e1b22c0bf726022c01b8,267577d47e497a0630bc454b3f74c4fd9a10ced4..2eb3c4fe4eebcdea3da0790cc0ba74cb286ec4f4
--- 1/apps/calendar/appinfo/version
--- 2/apps/calendar/appinfo/version
+++ b/apps/calendar/appinfo/version
@@@ -1,1 -1,1 +1,1 @@@
- 0.5
- -0.4.1
++0.5
author	Georg Ehrke <dev@georgswebsite.de>
	Wed, 13 Jun 2012 09:40:00 +0000 (11:40 +0200)
committer	Georg Ehrke <dev@georgswebsite.de>
	Wed, 13 Jun 2012 09:40:00 +0000 (11:40 +0200)
		1	2
apps/calendar/appinfo/database.xml	patch \|	diff1 \|	diff2 \|	blob \| history
apps/calendar/appinfo/version	patch \|	diff1 \|	diff2 \|	blob \| history