diff options
| author | Federico Tomassetti <federico@tomassetti.me> | 2017-02-04 21:33:54 +0100 |
|---|---|---|
| committer | Federico Tomassetti <federico@tomassetti.me> | 2017-02-15 21:39:04 +0100 |
| commit | fd62d3acaa1252b8093f87c9c2648739a54a7309 (patch) | |
| tree | 1f3625b67939ef6757f916d05dd16ad42074fef0 /javaparser-core/src/main/java/com/github/javaparser/ast/stmt | |
| parent | 45adbefb819caef2ad19921d32b13af560f35c99 (diff) | |
| download | javaparser-fd62d3acaa1252b8093f87c9c2648739a54a7309.tar.gz | |
issue705: fixing after rebasing
Diffstat (limited to 'javaparser-core/src/main/java/com/github/javaparser/ast/stmt')
| -rw-r--r-- | javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java index b46d62bb9..6ddf151df 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java @@ -29,12 +29,9 @@ import com.github.javaparser.ast.nodeTypes.NodeWithBody; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; -<<<<<<< HEAD import java.util.Arrays; -======= import java.util.LinkedList; ->>>>>>> issue705: correct ForStmt getNodeLists import java.util.List; import java.util.Optional; import static com.github.javaparser.utils.Utils.assertNotNull; |