diff --git a/docs/manual/CoreTasks/macrodef.html b/docs/manual/CoreTasks/macrodef.html
index 17b826a88..85cd9d849 100644
--- a/docs/manual/CoreTasks/macrodef.html
+++ b/docs/manual/CoreTasks/macrodef.html
@@ -339,7 +339,6 @@
 </macrodef/>
 <test one="test"/>
 </pre>
->>>>>>> 1.14
     </blockquote>
 <hr>
 <p align="center">Copyright &copy; 2003-2004 The Apache Software