Remove CVS conflict section.
authorZdeněk Salvet <salvet@ics.muni.cz>
Wed, 20 Sep 2006 10:50:08 +0000 (10:50 +0000)
committerZdeněk Salvet <salvet@ics.muni.cz>
Wed, 20 Sep 2006 10:50:08 +0000 (10:50 +0000)
commitb66329b4994b45d072936ef28372f54a0a69cac9
tree9ceb719f2e6a726d8341ff6d9a84795477a076cb
parent68e6b5595f05d300941d6f9b99ee4d1ba0a888cb
Remove CVS conflict section.
org.glite.lb.client/project/configure.properties.xml