From b66329b4994b45d072936ef28372f54a0a69cac9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20Salvet?= Date: Wed, 20 Sep 2006 10:50:08 +0000 Subject: [PATCH] Remove CVS conflict section. --- org.glite.lb.client/project/configure.properties.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 -- 1.8.2.3