From 4985cd891399ea1f84e0634ccae2035145f6d9ab Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Tue, 20 Apr 2004 17:41:27 +0000
Subject: [PATCH] Removed v1.14 conflict indicator.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276362 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/CoreTasks/macrodef.html | 1 -
 1 file changed, 1 deletion(-)

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 @@
 &lt;/macrodef/&gt;
 &lt;test one="test"/&gt;
 </pre>
->>>>>>> 1.14
     </blockquote>
 <hr>
 <p align="center">Copyright &copy; 2003-2004 The Apache Software