diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-11-21 10:21:40 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-11-21 10:21:40 +0800 |
| commit | 0f442b0884aa8ffc2043c73912232f01928924d2 (patch) | |
| tree | 5ebc9104f9505d5f11ee613311a5bf9090525478 | |
| parent | 2cf986c43b05072cdcacf05aef0c5ddd595c1f18 (diff) | |
| download | gsoc2013-evolution-0f442b0884aa8ffc2043c73912232f01928924d2.tar.gz gsoc2013-evolution-0f442b0884aa8ffc2043c73912232f01928924d2.tar.zst gsoc2013-evolution-0f442b0884aa8ffc2043c73912232f01928924d2.zip | |
fix changelog merge conflicts
svn path=/trunk/; revision=6622
| -rw-r--r-- | camel/ChangeLog | 1 |
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 |