From 34b0edddc01c9903b4bd665fae99b0ac81c2a605 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Thu, 11 Mar 2004 21:24:40 +0000
Subject: fixed ChangeLog

svn path=/trunk/; revision=25037
---
 camel/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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.
-- 
cgit