Removed some <<< stuff i missed.

svn path=/trunk/; revision=15607
This commit is contained in:
Michael Zucci 2002-02-08 02:15:56 +00:00
parent d56ec225b8
commit 5755c06e87

View File

@ -261,7 +261,6 @@
Modify the interface so that we can limit the size of the uid set Modify the interface so that we can limit the size of the uid set
string returned. string returned.
>>>>>>> 1.1366
2002-01-14 Not Zed <NotZed@Ximian.com> 2002-01-14 Not Zed <NotZed@Ximian.com>
* providers/imap/camel-imap-search.c (imap_body_contains): * providers/imap/camel-imap-search.c (imap_body_contains):