cvs commit: jakarta-turbine-tdk/xdocs tdk-howto.xml

quintonm    2003/04/10 20:27:56

  Modified:    xdocs    tdk-howto.xml
  Log:
  I seem to have checked in a merge conflict....
  
  Revision  Changes    Path
  1.10      +0 -4      jakarta-turbine-tdk/xdocs/tdk-howto.xml
  
  Index: tdk-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-tdk/xdocs/tdk-howto.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- tdk-howto.xml	11 Apr 2003 00:53:15 -0000	1.9
  +++ tdk-howto.xml	11 Apr 2003 03:27:56 -0000	1.10
  @@ -36,11 +36,7 @@
   Before using the TDK, you are going to need to have a Java Software
   Development Kit supporting Java version 1.2 or later installed on your machine.
   Sun's Java SDK can be downloaded from their website located
  -<<<<<<< tdk-howto.xml
  -<a href="http://java.sun.com/j2se/1.4.1/">here.</a>
  -=======
   <a href="http://java.sun.com/j2se/downloads.html">here.</a>
  ->>>>>>> 1.8
   </p>
   
   <p>