From 5755c06e872c9e59f54e1047d5426d6d9fb733fe Mon Sep 17 00:00:00 2001
From: Michael Zucci <zucchi@src.gnome.org>
Date: Fri, 8 Feb 2002 02:15:56 +0000
Subject: 	Removed some <<< stuff i missed.

svn path=/trunk/; revision=15607
---
 camel/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'camel/ChangeLog')

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):
-- 
cgit v1.2.3