[jboss-cvs] jboss-seam/examples/hibernate2 ...

[Michael Yuan]

  User: myuan   
  Date: 07/07/17 12:46:57

  Modified:    examples/hibernate2  build.xml
  Log:
  Sorry, checked in conflicted version last time ...
  
  Revision  Changes    Path
  1.23      +1 -6      jboss-seam/examples/hibernate2/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/hibernate2/build.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- build.xml	17 Jul 2007 16:43:22 -0000	1.22
  +++ build.xml	17 Jul 2007 16:46:57 -0000	1.23
  @@ -36,13 +36,8 @@
       	<ant antfile="build-glassfish.xml" target="clean" />
       	<ant antfile="build-weblogic92.xml" target="clean" />
       	<ant antfile="build-websphere61.xml" target="clean" />
  -<<<<<<< build.xml
       	<ant antfile="build-tomcat55.xml" target="clean" />
       	<ant antfile="build-tomcat6.xml" target="clean" />
  -=======
  -    	<ant antfile="build-tomcat55.xml" target="clean" />
  -		<ant antfile="build-tomcat6.xml" target="clean" />
  ->>>>>>> 1.21
      </target>
   
      <target name="all" depends="jboss, jboss405, glassfish, weblogic92, websphere61, tomcat55, tomcat6" description="Build Hibernate Booking example, for deployment to all supported application servers"/>