aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorJain Vivek <jvivek@src.gnome.org>2005-05-05 16:19:41 +0800
committerJain Vivek <jvivek@src.gnome.org>2005-05-05 16:19:41 +0800
commit43989013fe2ce7152ac37cf6a80aaa2f61cd17e6 (patch)
treea5c4d0993b9372a949ed03e5b26617ee4986b741 /plugins
parent487c3e5088f164c0277d39ea189142498eda0bae (diff)
downloadgsoc2013-evolution-43989013fe2ce7152ac37cf6a80aaa2f61cd17e6.tar
gsoc2013-evolution-43989013fe2ce7152ac37cf6a80aaa2f61cd17e6.tar.gz
gsoc2013-evolution-43989013fe2ce7152ac37cf6a80aaa2f61cd17e6.tar.bz2
gsoc2013-evolution-43989013fe2ce7152ac37cf6a80aaa2f61cd17e6.tar.lz
gsoc2013-evolution-43989013fe2ce7152ac37cf6a80aaa2f61cd17e6.tar.xz
gsoc2013-evolution-43989013fe2ce7152ac37cf6a80aaa2f61cd17e6.tar.zst
gsoc2013-evolution-43989013fe2ce7152ac37cf6a80aaa2f61cd17e6.zip
*** empty log message ***
svn path=/trunk/; revision=29270
Diffstat (limited to 'plugins')
-rw-r--r--plugins/shared-folder/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/shared-folder/ChangeLog b/plugins/shared-folder/ChangeLog
index 13cb813308..7378fd0e21 100644
--- a/plugins/shared-folder/ChangeLog
+++ b/plugins/shared-folder/ChangeLog
@@ -32,7 +32,6 @@
name from the top most parent. This will give proper container id
even in the case of the duplicate names at different hierarchies
->>>>>>> 1.15
2005-03-10 Vivek Jain <jvivek@novell.com>
**Fixes #73201