projects / platform / upstream / evolution-data-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f6c0cd3)
fixed merge conflicts
authorJeffrey Stedfast <fejj@src.gnome.org>
Wed, 26 Sep 2001 20:51:19 +0000 (20:51 +0000)
committerJeffrey Stedfast <fejj@src.gnome.org>
Wed, 26 Sep 2001 20:51:19 +0000 (20:51 +0000)
camel/ChangeLog patch | blob | history

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 95c8e36..5e30c56 100644 (file)
--- 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.
 
Domain: Service Framework / Uncategorized;