From 632f8e0634d47070f146203d7cd765232ffa78a5 Mon Sep 17 00:00:00 2001
From: Jon Trowbridge <trow@src.gnome.org>
Date: Wed, 6 Jun 2001 22:35:55 +0000
Subject: Removed some left-over conflict indicators.

svn path=/trunk/; revision=10140
---
 shell/ChangeLog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 2f4440b690..9520a98d01 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,4 +1,4 @@
-2001-06-06  Jon Trowbridge  <trow@gnu.org>
+2001-06-06  Jon Trowbridge  <trow@ximian.com>
 
 	* evolution-storage.c (impl_Storage_async_create_folder): Changed
 	purely informational debug spew from a g_warning to a g_message.
@@ -52,7 +52,6 @@
 	(insert_storages): Minor change here too.
 	(new_folder_cb): Ditto.
 	
->>>>>>> 1.439
 2001-06-05  Jason Leach  <jleach@ximian.com>
 
 	* e-shell-view-menu.c: Plug in all the folder tree right click
-- 
cgit v1.2.3