Skip to content

Commit c906abc

Browse files
committed
Fix base conflict resolution
1 parent 4250827 commit c906abc

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverterJavadocTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.eclipse.jdt.core.compiler.IProblem;
3232
import org.eclipse.jdt.core.dom.*;
3333
import org.eclipse.jdt.core.tests.javac.JavacFailReason;
34-
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
3534
import org.eclipse.jdt.internal.compiler.parser.ScannerHelper;
3635
import org.junit.Ignore;
3736
import org.junit.experimental.categories.Category;
@@ -2159,7 +2158,7 @@ public void testBug68726() throws JavaModelException {
21592158
@Category(value=Ignore.class) @JavacFailReason(cause=JavacFailReason.JDT_RECOVERS_FROM_BAD_INPUTS)
21602159
public void testBug70892_JLS3() throws JavaModelException {
21612160
int level = this.astLevel;
2162-
this.astLevel = getJLS3();
2161+
this.astLevel = getJLSFirst();
21632162
verifyComments("testBug70892");
21642163
this.astLevel = level;
21652164
}

0 commit comments

Comments
 (0)