projects / platform / upstream / evolution-data-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d7bc69a)
Removed some <<< stuff i missed.
authorMichael Zucci <zucchi@src.gnome.org>
Fri, 8 Feb 2002 02:15:56 +0000 (02:15 +0000)
committerMichael Zucci <zucchi@src.gnome.org>
Fri, 8 Feb 2002 02:15:56 +0000 (02:15 +0000)
camel/ChangeLog patch | blob | history

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 788b1cc..2fe82a6 100644 (file)
--- 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):
Domain: Service Framework / Uncategorized;