aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ded9f6d2d7..9869fe6560 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -28,7 +28,6 @@
* gui/dialogs/send-comp.c (send_component_dialog): remove useless
assignment
->>>>>>> 1.910
2001-06-20 Rodrigo Moya <rodrigo@ximian.com>
* idl/evolution-calendar.idl: added getFreeBusy method