aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorMichael Zucci <zucchi@src.gnome.org>2002-02-08 10:15:56 +0800
committerMichael Zucci <zucchi@src.gnome.org>2002-02-08 10:15:56 +0800
commit5755c06e872c9e59f54e1047d5426d6d9fb733fe (patch)
tree4ed21dc11d833099c9fb5f255a7c5409f93c6504 /camel
parentd56ec225b805cb7a071d10adf99a93979cb3d0e7 (diff)
downloadgsoc2013-evolution-5755c06e872c9e59f54e1047d5426d6d9fb733fe.tar.gz
gsoc2013-evolution-5755c06e872c9e59f54e1047d5426d6d9fb733fe.tar.zst
gsoc2013-evolution-5755c06e872c9e59f54e1047d5426d6d9fb733fe.zip
Removed some <<< stuff i missed.
svn path=/trunk/; revision=15607
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 788b1ccfe1..2fe82a6560 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -261,7 +261,6 @@
Modify the interface so that we can limit the size of the uid set
string returned.
->>>>>>> 1.1366
2002-01-14 Not Zed <NotZed@Ximian.com>
* providers/imap/camel-imap-search.c (imap_body_contains):