aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/ChangeLog')
-rw-r--r--calendar/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 66efa153be..aa452faf12 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -516,7 +516,6 @@
* cal-client/cal-client-multi.[ch]:
* cal-client/Makefile.am: removed obsolete code.
->>>>>>> 1.1841.2.20
2003-07-29 Rodrigo Moya <rodrigo@ximian.com>
Fixes all "alarm daemon doesn't start with session"