bloritsch    02/04/02 13:31:30

  Modified:    event    Tag: depchecking build.xml
  Log:
  fix my stupid mistake
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.5   +0 -5      jakarta-avalon-excalibur/event/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
  retrieving revision 1.7.2.4
  retrieving revision 1.7.2.5
  diff -u -r1.7.2.4 -r1.7.2.5
  --- build.xml 2 Apr 2002 21:23:37 -0000       1.7.2.4
  +++ build.xml 2 Apr 2002 21:31:30 -0000       1.7.2.5
  @@ -17,14 +17,9 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${junit.jar}"/>
  -<<<<<<< build.xml
  -     <pathelement location="${checkstyle.jar}"/>
  -     <pathelement location="${excalibur-concurrent.jar}"/>
  -=======
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-concurrent.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  ->>>>>>> 1.7
       </path>
       <property name="cp" refid="project.class.path"/>
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to