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 ba2c0d3d56..676ed01190 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -175,7 +175,6 @@
(add_storage): Only call mail_note_store() if we plan on
auto-connecting.
->>>>>>> 1.2246
2002-07-02 Jeffrey Stedfast <fejj@ximian.com>
* folder-browser.c (on_right_click): Increase the size of the