From 31b07ed6985969d6d9663a0e9ed51217910dd7c0 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 26 Aug 2011 12:19:15 +0200 Subject: [PATCH] fix: regenerate tests/Makefile.in --- tests/Makefile.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/Makefile.in b/tests/Makefile.in index 434644d1b..3f603c7a0 100644 --- 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 \ -- 2.47.2