fix: regenerate tests/Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 434644d1bc2b502ff05763c4f13e44679176c9bd..3f603c7a0fd3c8d41ff033efafa7126a39c16d73 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -723,11 +723,8 @@ java.test \
 java2.test \
 java3.test \
 java-check.test \
-<<<<<<< HEAD
 java-clean.test \
-=======
 java-empty-classpath.test \
->>>>>>> maint
 javaprim.test \
 javasubst.test \
 javaflags.test \