Fix merge conflict
Some checks failed
Build and Test with Maven / Build-and-test-with-Maven (push) Failing after 43s

This commit is contained in:
Daniel Holle 2024-06-07 12:16:03 +02:00
parent 60a1f3b220
commit 091a6b8f1f

View File

@ -1134,17 +1134,17 @@ public class TestComplete {
}
@Test
<<<<<<< HEAD
public void testBug337() throws Exception {
var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug337.jav");
var clazz = classFiles.get("Bug337");
var instance = clazz.getDeclaredConstructor().newInstance();
clazz.getDeclaredMethod("main").invoke(instance);
=======
}
@Test
public void testBug338() throws Exception {
var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug338.jav");
var clazz = classFiles.get("Bug338");
var instance = clazz.getDeclaredConstructor().newInstance();
>>>>>>> ea217d16d5a1d635ac7fe961b98c2ad993c14ac5
}
}