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 4928397f0b..6950b626ca 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -114,7 +114,6 @@
to 1 rather than 0, so if you move the hpane you'll see the date
navigator.
->>>>>>> 1.631
2000-10-19 Jesse Pavel <jpavel@helixcode.com>
* gui/event-editor.[ch]: added a public function which causes the