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 18565b59a4..f35440a010 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -81,7 +81,6 @@
* gui/e-day-view.c (e_day_view_finish_resize): hide canvas items and
update internal fields before updating the object.
->>>>>>> 1.1774
2003-05-15 JP Rosevear <jpr@ximian.com>
* gui/dialogs/comp-editor.c (comp_editor_finalize): unref the