Skip to content

Commit

Permalink
Fix base conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
mickaelistria committed Feb 6, 2025
1 parent 4250827 commit c906abc
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.eclipse.jdt.core.compiler.IProblem;
import org.eclipse.jdt.core.dom.*;
import org.eclipse.jdt.core.tests.javac.JavacFailReason;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jdt.internal.compiler.parser.ScannerHelper;
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
Expand Down Expand Up @@ -2159,7 +2158,7 @@ public void testBug68726() throws JavaModelException {
@Category(value=Ignore.class) @JavacFailReason(cause=JavacFailReason.JDT_RECOVERS_FROM_BAD_INPUTS)
public void testBug70892_JLS3() throws JavaModelException {
int level = this.astLevel;
this.astLevel = getJLS3();
this.astLevel = getJLSFirst();
verifyComments("testBug70892");
this.astLevel = level;
}
Expand Down

0 comments on commit c906abc

Please sign in to comment.