| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.php.internal.core.PHPVersion;
import org.eclipse.php.internal.core.ast.nodes.*;
import org.eclipse.php.internal.core.ast.visitor.AbstractVisitor;
<<<<<<< HEAD
=======
@SuppressWarnings({"unchecked", "nls", "deprecation"})
>>>>>>> a0e2258c252d52525b1a6a9cbb760c41125b36c2
public class ASTRewriteFlattener extends AbstractVisitor {
public static String asString(ASTNode node, RewriteEventStore store) { |
| Solution content |
|---|
import org.eclipse.php.internal.core.PHPVersion;
import org.eclipse.php.internal.core.ast.nodes.*;
import org.eclipse.php.internal.core.ast.visitor.AbstractVisitor;
@SuppressWarnings({"unchecked", "nls", "deprecation"})
public class ASTRewriteFlattener extends AbstractVisitor {
public static String asString(ASTNode node, RewriteEventStore store) { |
| File |
|---|
| ASTRewriteFlattener.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |