aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/shared-folder/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/shared-folder/ChangeLog')
-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