From b37d64d0232e1060f84f64c7e91093ff291598d5 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 21 Sep 2016 19:16:44 +0200 Subject: [PATCH] committed conflict marker --- WHATSNEW | 1 - 1 file changed, 1 deletion(-) diff --git a/WHATSNEW b/WHATSNEW index 0b232c3a3..7cc851bb2 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -117,7 +117,6 @@ Other changes: when run on Java 9 so the redirect extension function can be used if when a SecurityManager is active. Bugzilla Report 60060 ->>>>>>> 1.9.x Changes from Ant 1.9.6 TO Ant 1.9.7 ===================================