aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-02-25 22:45:09 +0800
committerDan Winship <danw@src.gnome.org>2003-02-25 22:45:09 +0800
commit7a0f761f14926e2b4454e05829ae4a27d9160a34 (patch)
tree9b401c02955510d002f8311bab7de5ede88c3a96 /shell
parent71caaeddaabff9f25d0f89acab421554e661fbe9 (diff)
downloadgsoc2013-evolution-7a0f761f14926e2b4454e05829ae4a27d9160a34.tar
gsoc2013-evolution-7a0f761f14926e2b4454e05829ae4a27d9160a34.tar.gz
gsoc2013-evolution-7a0f761f14926e2b4454e05829ae4a27d9160a34.tar.bz2
gsoc2013-evolution-7a0f761f14926e2b4454e05829ae4a27d9160a34.tar.lz
gsoc2013-evolution-7a0f761f14926e2b4454e05829ae4a27d9160a34.tar.xz
gsoc2013-evolution-7a0f761f14926e2b4454e05829ae4a27d9160a34.tar.zst
gsoc2013-evolution-7a0f761f14926e2b4454e05829ae4a27d9160a34.zip
remove some cvs merge cruft
svn path=/trunk/; revision=20050
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):