You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/05/28 05:10:47 UTC

[07/14] ant git commit: Bad merge: missed a diamond

Bad merge: missed a diamond

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

Branch: refs/heads/master
Commit: 64809d976e89e1dc36efd825772caf2b07c4f7da
Parents: 8c38eb4
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sat May 26 20:03:32 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sat May 26 20:03:32 2018 +0200

----------------------------------------------------------------------
 src/main/org/apache/tools/ant/taskdefs/Recorder.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/64809d97/src/main/org/apache/tools/ant/taskdefs/Recorder.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
index d632a85..2640e90 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
@@ -67,7 +67,8 @@ public class Recorder extends Task implements SubBuildListener {
     /** Strip task banners if true.  */
     private boolean emacsMode = false;
     /** The list of recorder entries. */
-    private static Hashtable<String, RecorderEntry> recorderEntries = new Hashtable<>();
+    private static Hashtable<String, RecorderEntry> recorderEntries
+            = new Hashtable<String, RecorderEntry>();
 
     //////////////////////////////////////////////////////////////////////
     // CONSTRUCTORS / INITIALIZERS