Repository: ant
Updated Branches:
  refs/heads/master 9a0fa3f5d -> b37d64d02


committed conflict marker


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b37d64d0
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b37d64d0
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b37d64d0

Branch: refs/heads/master
Commit: b37d64d0232e1060f84f64c7e91093ff291598d5
Parents: 9a0fa3f
Author: Stefan Bodewig <bode...@apache.org>
Authored: Wed Sep 21 19:16:44 2016 +0200
Committer: Stefan Bodewig <bode...@apache.org>
Committed: Wed Sep 21 19:16:44 2016 +0200

----------------------------------------------------------------------
 WHATSNEW | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/b37d64d0/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index 0b232c3..7cc851b 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
 ===================================

Reply via email to