dleslie 00/10/05 07:10:01
Modified: java build.xml
Log:
Removed merge error.
Revision Changes Path
1.23 +1 -9 xml-xalan/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/java/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 2000/10/05 13:41:06 1.22
+++ build.xml 2000/10/05 14:09:59 1.23
@@ -41,9 +41,9 @@
- Much of this file stolen from Stefano's xml-xerces build.xml
<<<<<<< build.xml
- $Id: build.xml,v 1.22 2000/10/05 13:41:06 dleslie Exp $
+ $Id: build.xml,v 1.23 2000/10/05 14:09:59 dleslie Exp $
=======
- $Id: build.xml,v 1.22 2000/10/05 13:41:06 dleslie Exp $
+ $Id: build.xml,v 1.23 2000/10/05 14:09:59 dleslie Exp $
>>>>>>> 1.20
==================================================================== -->
@@ -365,13 +365,5 @@
<copydir src="${build.docs}/resources"
dest="${site.dir}/docs/resources"/>
<copydir src="${build.apidocs}" dest="${site.dir}/apidocs"/>
</target-->
-<<<<<<< build.xml
-=======
- <target name="docsxalan1">
-
- <java fork="yes" classname="${doc.generator}"
classpath="../build/xalan.jar:../xdocs/stylebook-1.0-b2.jar:${java.class.path}"
- args="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
- </target>
-
->>>>>>> 1.20
+
</project>
