Browse Source

Resolve unresolved conflict

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273082 13f79535-47bb-0310-9956-ffa450edef68
master
Magesh Umasankar 23 years ago
parent
commit
d63e5f7e83
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      WHATSNEW

+ 1
- 2
WHATSNEW View File

@@ -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


Loading…
Cancel
Save