Re: [cml-discuss] selfml/build.xml

[Dr P. Murray-R. <pm...@he...>]

Greetings all - for various reasons I haven't been very active on SELFML.

I recently updated on CVS and the build.xml appears to be a build.xml,v
file - it seems to have diffs in it and isn't WF XML. Is this a windows
problem? or do I have to reset something? It contains stuff like:



<!--
    <style
	  in="${build}/propertyType/propertyTypeList.xml"
	  out="${build}/build_propertyType.xml"
<<<<<<< build.xml
	  style="${build}/xsl/build_propertyType.xsl"/>
-->
    <style
	  in="${build}/propertyType/propertyTypeList.xml"
	  out="${build}/build_propertyType.xml"
	  style="${build}/xsl/build_propertyType.xsl"/>
=======
	  style="${build}/xsl/build_propertyType.xsl">
       <outputproperty name="method" value="xml"/>
    </style>
>>>>>>> 1.13


Best

P.