aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Ewing <lewing@src.gnome.org>2001-10-16 04:41:52 +0800
committerLarry Ewing <lewing@src.gnome.org>2001-10-16 04:41:52 +0800
commitcd0111464fecd13de75fe721a29e22a0a358fd0d (patch)
tree0db3f2fce7a54fa21f98ba76ada59cfb84cd1615
parent4660c390a0d556797cac7e288718d6a0c0b481b8 (diff)
downloadgsoc2013-evolution-cd0111464fecd13de75fe721a29e22a0a358fd0d.tar.gz
gsoc2013-evolution-cd0111464fecd13de75fe721a29e22a0a358fd0d.tar.zst
gsoc2013-evolution-cd0111464fecd13de75fe721a29e22a0a358fd0d.zip
conflict droppings
svn path=/trunk/; revision=13684
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ab19aa1666..4ff010ecb8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -25,7 +25,6 @@
* mail-mt.c (mail_call_main): new generic interface for calling
stuff/proxying in the gui thread.
->>>>>>> 1.1832
2001-10-14 Jon Trowbridge <trow@ximian.com>
* e-searching-tokenizer.c (e_searching_tokenizer_clone): Share