aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2001-09-27 04:51:19 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-09-27 04:51:19 +0800
commitc536b67a734ebfa42151740988c0fd8f26a8c2de (patch)
tree19d305e26c4f1ba4e2864bb888027949002ccb33 /camel
parentce3e488074e540d16b972e1dc691d2a8ea3f825b (diff)
downloadgsoc2013-evolution-c536b67a734ebfa42151740988c0fd8f26a8c2de.tar.gz
gsoc2013-evolution-c536b67a734ebfa42151740988c0fd8f26a8c2de.tar.zst
gsoc2013-evolution-c536b67a734ebfa42151740988c0fd8f26a8c2de.zip
fixed merge conflicts
svn path=/trunk/; revision=13166
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.