From 7a0f761f14926e2b4454e05829ae4a27d9160a34 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Tue, 25 Feb 2003 14:45:09 +0000
Subject: remove some cvs merge cruft

svn path=/trunk/; revision=20050
---
 shell/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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):
-- 
cgit v1.2.3