diff options
| -rw-r--r-- | camel/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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): |