aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
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 95c8e363c4..5e30c5670b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -26,7 +26,6 @@
thanks to a pedantic.
2001-09-26 Jeffrey Stedfast <fejj@ximian.com>
->>>>>>> 1.1175
* Makefile.am: Fix Ettore's fix.