From 0f442b0884aa8ffc2043c73912232f01928924d2 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 21 Nov 2000 02:21:40 +0000 Subject: fix changelog merge conflicts svn path=/trunk/; revision=6622 --- camel/ChangeLog | 1 - 1 file changed, 1 deletion(-) (limited to 'camel') diff --git a/camel/ChangeLog b/camel/ChangeLog index 3fbf6b60d7..3f79ac4df7 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -124,7 +124,6 @@ parsing (all other data can be retrieved by the caller except this). ->>>>>>> 1.594 2000-11-17 Jeffrey Stedfast * providers/imap/camel-imap-utils.c (imap_parse_nstring): When -- cgit v1.2.3