Browse Source

committed conflict marker

master
Stefan Bodewig 8 years ago
parent
commit
b37d64d023
1 changed files with 0 additions and 1 deletions
  1. +0
    -1
      WHATSNEW

+ 0
- 1
WHATSNEW View File

@@ -117,7 +117,6 @@ Other changes:
when run on Java 9 so the redirect extension function can be used when run on Java 9 so the redirect extension function can be used
if when a SecurityManager is active. if when a SecurityManager is active.
Bugzilla Report 60060 Bugzilla Report 60060
>>>>>>> 1.9.x


Changes from Ant 1.9.6 TO Ant 1.9.7 Changes from Ant 1.9.6 TO Ant 1.9.7
=================================== ===================================


Loading…
Cancel
Save