cvs commit: ant/docs/manual/CoreTasks macrodef.html

[mbenson]

mbenson     2004/04/20 10:41:27

  Modified:    docs/manual/CoreTasks macrodef.html
  Log:
  Removed v1.14 conflict indicator.
  
  Revision  Changes    Path
  1.17      +0 -1      ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- macrodef.html     20 Apr 2004 15:42:34 -0000      1.16
  +++ macrodef.html     20 Apr 2004 17:41:27 -0000      1.17
  @@ -339,7 +339,6 @@
   </macrodef/>
   <test one="test"/>
   </pre>
  ->>>>>>> 1.14
       </blockquote>
   <hr>
   <p align="center">Copyright &copy; 2003-2004 The Apache Software
  
  
  

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