From 43989013fe2ce7152ac37cf6a80aaa2f61cd17e6 Mon Sep 17 00:00:00 2001
From: Jain Vivek <jvivek@src.gnome.org>
Date: Thu, 5 May 2005 08:19:41 +0000
Subject: *** empty log message ***

svn path=/trunk/; revision=29270
---
 plugins/shared-folder/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'plugins')

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
-- 
cgit v1.2.3