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 8c54a4caed..72d722fce5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -24,7 +24,6 @@
(cal_component_set_dtend): Ditto.
(cal_component_set_due): Ditto.
->>>>>>> 1.434
2000-07-06 Federico Mena Quintero <federico@helixcode.com>
* cal-util/cal-component.c (scan_property): Handle the