From 85e5e335ee6c5374e2837b2cbf6f6c0864c03697 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 4 Jan 2001 21:48:22 +0000 Subject: Remove conflict thingie from a while back svn path=/trunk/; revision=7259 --- camel/ChangeLog | 1 - 1 file changed, 1 deletion(-) (limited to 'camel') diff --git a/camel/ChangeLog b/camel/ChangeLog index 6cac6f7818..90ab2c8269 100644 --- 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 * camel-mime-utils.c (header_fold): When checking to see if we -- cgit v1.2.3