aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorJP Rosevear <jpr@src.gnome.org>2001-01-05 05:48:22 +0800
committerJP Rosevear <jpr@src.gnome.org>2001-01-05 05:48:22 +0800
commit85e5e335ee6c5374e2837b2cbf6f6c0864c03697 (patch)
treeafc63c1ec027f6c0a89f75eb9585d1162815497b /camel
parentf80697d7a5285d08f9e434feb688ce4406a12ee7 (diff)
downloadgsoc2013-evolution-85e5e335ee6c5374e2837b2cbf6f6c0864c03697.tar
gsoc2013-evolution-85e5e335ee6c5374e2837b2cbf6f6c0864c03697.tar.gz
gsoc2013-evolution-85e5e335ee6c5374e2837b2cbf6f6c0864c03697.tar.bz2
gsoc2013-evolution-85e5e335ee6c5374e2837b2cbf6f6c0864c03697.tar.lz
gsoc2013-evolution-85e5e335ee6c5374e2837b2cbf6f6c0864c03697.tar.xz
gsoc2013-evolution-85e5e335ee6c5374e2837b2cbf6f6c0864c03697.tar.zst
gsoc2013-evolution-85e5e335ee6c5374e2837b2cbf6f6c0864c03697.zip
Remove conflict thingie from a while back
svn path=/trunk/; revision=7259
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 6cac6f7818..90ab2c8269 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -799,7 +799,6 @@
(struct _CamelFolder): Moved changed_changed/frozen into private
data, since it really is private and now needs locked access.
->>>>>>> 1.641.2.8
2000-12-15 Jeffrey Stedfast <fejj@helixcode.com>
* camel-mime-utils.c (header_fold): When checking to see if we