aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Trowbridge <trow@src.gnome.org>2001-06-07 06:35:55 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-06-07 06:35:55 +0800
commit632f8e0634d47070f146203d7cd765232ffa78a5 (patch)
tree7b3d67139406396064b7f13b33605ed3222a3168
parent53fe0954cb52ebad13c96967077501fe28b868d3 (diff)
downloadgsoc2013-evolution-632f8e0634d47070f146203d7cd765232ffa78a5.tar
gsoc2013-evolution-632f8e0634d47070f146203d7cd765232ffa78a5.tar.gz
gsoc2013-evolution-632f8e0634d47070f146203d7cd765232ffa78a5.tar.bz2
gsoc2013-evolution-632f8e0634d47070f146203d7cd765232ffa78a5.tar.lz
gsoc2013-evolution-632f8e0634d47070f146203d7cd765232ffa78a5.tar.xz
gsoc2013-evolution-632f8e0634d47070f146203d7cd765232ffa78a5.tar.zst
gsoc2013-evolution-632f8e0634d47070f146203d7cd765232ffa78a5.zip
Removed some left-over conflict indicators.
svn path=/trunk/; revision=10140
-rw-r--r--shell/ChangeLog3
1 files changed, 1 insertions, 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