Remove conflict thingie from a while back

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 6cac6f7..90ab2c8 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -799,7 +799,6 @@
        (struct _CamelFolder): Moved changed_changed/frozen into private
        data, since it really is private and now needs locked access.
 
->>>>>>> 1.641.2.8
 2000-12-15  Jeffrey Stedfast  <fejj@helixcode.com>
 
        * camel-mime-utils.c (header_fold): When checking to see if we