diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-04-24 02:16:23 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-04-24 02:16:23 +0800 |
| commit | feb3551818011d172c312ee357353a0aec472973 (patch) | |
| tree | 7ad8f260b15c143578df9c8458d9163e00e7d15c /camel/ChangeLog | |
| parent | 9294fc3e566052b923e9b98d51ae577c7b9d1955 (diff) | |
| download | gsoc2013-evolution-feb3551818011d172c312ee357353a0aec472973.tar.gz gsoc2013-evolution-feb3551818011d172c312ee357353a0aec472973.tar.zst gsoc2013-evolution-feb3551818011d172c312ee357353a0aec472973.zip | |
fixed merge conflicts in ChangeLog
svn path=/trunk/; revision=20937
Diffstat (limited to 'camel/ChangeLog')
| -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 |