fixed merge conflicts in ChangeLog

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 4e850ff..7bf58a3 100644 (file)
--- 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