*** empty log message ***

svn path=/trunk/; revision=29270
2005-05-05 08:19:41 +00:00
parent 487c3e5088
commit 43989013fe
1 changed files with 0 additions and 1 deletions
--- 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