diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-09-26 20:51:19 +0000 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-09-26 20:51:19 +0000 |
| commit | b5f90b607c3d2a2439a440eca3555bba1541f0dc (patch) | |
| tree | 443dc54bc85e1111ad91b79952c509a9fbbe13c0 | |
| parent | f6c0cd30379109dc388c39efee40ac58bf4272f1 (diff) | |
| download | evolution-data-server-b5f90b607c3d2a2439a440eca3555bba1541f0dc.tar.gz | |
fixed merge conflicts
| -rw-r--r-- | camel/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 95c8e363c..5e30c5670 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. |