From 342f45f31d84b98cd342742c62f27b8f178d455a Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@src.gnome.org>
Date: Tue, 30 Mar 2004 23:40:19 +0000
Subject: fixed changelog

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

(limited to 'camel/ChangeLog')

diff --git a/camel/ChangeLog b/camel/ChangeLog
index ce8cbdbc63..a074fde7a1 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -36,7 +36,6 @@
 	* camel-debug.c (camel_debug_start, camel_debug_end): some helpers
 	to wrap debug output for atomicicity.
 
->>>>>>> 1.2077
 2004-03-29  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* providers/imap4/camel-imap4-folder.c (camel_imap4_folder_new):
-- 
cgit