From d63e5f7e835b2212b5ce3b6014b17d111bbcca60 Mon Sep 17 00:00:00 2001
From: Magesh Umasankar <umagesh@apache.org>
Date: Tue, 9 Jul 2002 21:08:30 +0000
Subject: [PATCH] Resolve unresolved conflict

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273082 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 96c812145..ac84acb29 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -418,9 +418,8 @@ Changes from Ant 1.4.1 to 1.5beta1
 Changes that could break older environments:
 --------------------------------------------
 
-<<<<<<< WHATSNEW
 * Important: Single $ signs are no longer silently stripped!
-=======
+
 * The filesetmanifest attribute added to <jar> after the 1.4.1 
   release has been removed for now.  This change may affect only
   the 1.5Beta/1.6Alpha users.  An attempt will be made to add this