dflorey 2004/08/05 07:53:44
Modified: . build.xml
Log:
Sorry... Removed conflict from build.xml
Revision Changes Path
1.227 +0 -3 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- build.xml 5 Aug 2004 14:45:33 -0000 1.226
+++ build.xml 5 Aug 2004 14:53:44 -0000 1.227
@@ -145,11 +145,8 @@
<pathelement location="${commons-httpclient.jar}"/>
<pathelement location="${slide.build}/classes"/>
<pathelement location="${commons-transaction.jar}"/>
-<<<<<<< build.xml
<pathelement location="${xml-im-exporter.jar}"/>
-=======
<pathelement location="${commons-codec.jar}"/>
->>>>>>> 1.225
</path>
<!-- =================================================================== -->
<!-- Detect -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
