aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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 <fejj@helixcode.com>
* providers/imap/camel-imap-utils.c (imap_parse_nstring): When