diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-04-23 18:16:23 +0000 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-04-23 18:16:23 +0000 |
| commit | 5d1f5b087ba1f9ca690b478b073c6605e1d62eaf (patch) | |
| tree | c18e8320c0d43f25f760b62f7cddfdf5dc7eced8 | |
| parent | 7877167c6108f2eb1445c1b3d3160cc9f43fe3d3 (diff) | |
| download | evolution-data-server-5d1f5b087ba1f9ca690b478b073c6605e1d62eaf.tar.gz | |
fixed merge conflicts in ChangeLog
| -rw-r--r-- | camel/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 4e850ff49..7bf58a376 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 |