Browse Source

Removed v1.14 conflict indicator.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276362 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 21 years ago
parent
commit
4985cd8913
1 changed files with 0 additions and 1 deletions
  1. +0
    -1
      docs/manual/CoreTasks/macrodef.html

+ 0
- 1
docs/manual/CoreTasks/macrodef.html View File

@@ -339,7 +339,6 @@
</macrodef/> </macrodef/>
<test one="test"/> <test one="test"/>
</pre> </pre>
>>>>>>> 1.14
</blockquote> </blockquote>
<hr> <hr>
<p align="center">Copyright &copy; 2003-2004 The Apache Software <p align="center">Copyright &copy; 2003-2004 The Apache Software


Loading…
Cancel
Save