aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 568b6dcc74..bbddcbce1c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -67,7 +67,6 @@
2001-09-05 Ettore Perazzoli <ettore@ximian.com>
->>>>>>> 1.1649
* message-browser.c (message_browser_new): s/Evolution/Ximian
Evolution/.