aboutsummaryrefslogtreecommitdiffstats
path: root/ui/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ui/ChangeLog')
-rw-r--r--ui/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 1f9c34983b..3c33bc1597 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -33,7 +33,6 @@
Ctrl-Shift-Y so we are more like O* and don't get in the way of
the Ctrl-Shift-C for "New Contact".
->>>>>>> 1.245
2001-09-04 Ettore Perazzoli <ettore@ximian.com>
* evolution-mail-global.xml: Add an F9 accelerator for the