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 10bb0b8b5d..ab971296ec 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -45,7 +45,6 @@
* mail-local.c (save_metainfo): Back to using e_xml_save_file().
->>>>>>> 1.2540
2003-01-14 Ettore Perazzoli <ettore@ximian.com>
* message-tag-editor.c (message_tag_editor_init): Make dialog