From 0b6a0d7f118c7fed8a20b0372a262b5b8e898693 Mon Sep 17 00:00:00 2001 From: Magesh Umasankar Date: Sat, 22 Jun 2002 23:46:50 +0000 Subject: [PATCH] Remove conflict resolution cruft. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272969 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 1 - 1 file changed, 1 deletion(-) diff --git a/WHATSNEW b/WHATSNEW index 35edc7fbf..ccd1fe4c4 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -313,7 +313,6 @@ Changes that could break older environments: -------------------------------------------- * Important: Single $ signs are no longer silently stripped! ->>>>>>> 1.263.2.51 Before you panic that we have broken all your build files, we have kept the old "$$" -> "$" behaviour. So only build files which accidentally had a $ sign in a string that was being silently stripped may break.