aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 3b56711524..02358efdc3 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -42,7 +42,6 @@
* e-shell.c (save_settings_for_component): lower-case the config prefix.
->>>>>>> 1.1176
2003-02-20 Dan Winship <danw@ximian.com>
* Makefile.am (evolution_LDADD):