From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 26 Aug 2011 10:19:15 +0000 (+0200)
Subject: fix: regenerate tests/Makefile.in
X-Git-Tag: ng-0.5a~123^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31b07ed6985969d6d9663a0e9ed51217910dd7c0;p=thirdparty%2Fautomake.git

fix: regenerate tests/Makefile.in
---

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 \