aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index d75244005b..4d2e4da6af 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -68,7 +68,6 @@
* camel-store.h: time to fix up the camelfolderinfo mess. fix
some member names, and add some type fields. Fixed all uses.
->>>>>>> 1.2033
2004-03-04 Not Zed <NotZed@Ximian.com>
** See bug #53355.