aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Williams <peterw@src.gnome.org>2002-07-15 22:45:08 +0800
committerPeter Williams <peterw@src.gnome.org>2002-07-15 22:45:08 +0800
commit7e9fe066648a94d79835ea45c83d536d03e558fe (patch)
tree22e33d6e104762897bd5423cb92b438eb4cbb7a5
parentb9f0e2bb93c07bedea09b81cabe72977d500454c (diff)
downloadgsoc2013-evolution-7e9fe066648a94d79835ea45c83d536d03e558fe.tar
gsoc2013-evolution-7e9fe066648a94d79835ea45c83d536d03e558fe.tar.gz
gsoc2013-evolution-7e9fe066648a94d79835ea45c83d536d03e558fe.tar.bz2
gsoc2013-evolution-7e9fe066648a94d79835ea45c83d536d03e558fe.tar.lz
gsoc2013-evolution-7e9fe066648a94d79835ea45c83d536d03e558fe.tar.xz
gsoc2013-evolution-7e9fe066648a94d79835ea45c83d536d03e558fe.tar.zst
gsoc2013-evolution-7e9fe066648a94d79835ea45c83d536d03e558fe.zip
remove a stray conflict marker
svn path=/trunk/; revision=17458
-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