From: Zdeněk Salvet <salvet@ics.muni.cz>
Date: Wed, 20 Sep 2006 10:50:08 +0000 (+0000)
Subject: Remove CVS conflict section.
X-Git-Tag: glite-lb-logger_R_1_3_3~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=b66329b4994b45d072936ef28372f54a0a69cac9;p=jra1mw.git

Remove CVS conflict section.
---

diff --git a/org.glite.lb.client/project/configure.properties.xml b/org.glite.lb.client/project/configure.properties.xml
index 4c6986f..4ca504f 100644
--- a/org.glite.lb.client/project/configure.properties.xml
+++ b/org.glite.lb.client/project/configure.properties.xml
@@ -20,15 +20,12 @@
 
 	Revision history:
 	$Log$
-<<<<<<< configure.properties.xml
+	Revision 1.7  2006/09/19 20:27:40  akrenek
+	Builds after merge _RC31
+
 	Revision 1.6  2006/04/20 07:06:31  jpospi
 	lb4vdt stuff and cleanup
 
-=======
-	Revision 1.5.2.1  2006/08/15 20:06:05  akrenek
-	merge of changes betwen merge_for_3_1_src and merge_30_31_src
-
->>>>>>> 1.5.2.1
 	Revision 1.5  2006/03/15 18:02:37  akrenek
 	cares