diff options
| -rw-r--r-- | camel/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 4e850ff49b..7bf58a376b 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -33,7 +33,6 @@ object bag instead of a hash table for the service 'cache'. (service_cache_remove): Removed, no longer required. ->>>>>>> 1.1801 2003-04-21 Jeffrey Stedfast <fejj@ximian.com> * camel-gpg-context.c (gpg_ctx_parse_status): Don't set seen_eof1 |