/antlets/version build.xml,1.3,1.4

Update of /cvsroot/metamorphosis//antlets/version
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6622/version

Modified Files:
	build.xml 
Log Message:
Ooops checked in a conflict.

Index: build.xml
===================================================================
RCS file: /cvsroot/metamorphosis//antlets/version/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	24 Feb 2004 07:13:30 -0000	1.3
--- build.xml	24 Feb 2004 07:18:16 -0000	1.4
***************
*** 1,8 ****
  <?xml version="1.0" ?>
! <<<<<<< build.xml
! <!-- $Header$ -->
! =======
  <!-- $Header$ -->
! >>>>>>> 1.2
  <project default="install-antlet" basedir="." name="makeantlet.version">
  
--- 1,6 ----
  <?xml version="1.0" ?>
! 
  <!-- $Header$ -->
! 
  <project default="install-antlet" basedir="." name="makeantlet.version">
  



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click