[Automake-commit] [SCM] GNU Automake branch, java-work, updated. v1.11-459-g31b07ed

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=31b07ed6985969d6d9663a0e9ed51217910dd7c0

The branch, java-work has been updated
       via  31b07ed6985969d6d9663a0e9ed51217910dd7c0 (commit)
      from  60bd0bf85380e6cabb50ff07cec3366c18f170b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31b07ed6985969d6d9663a0e9ed51217910dd7c0
Author: Stefano Lattarini <address@hidden>
Date:   Fri Aug 26 12:19:15 2011 +0200

    fix: regenerate tests/Makefile.in

-----------------------------------------------------------------------

Summary of changes:
 tests/Makefile.in |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 434644d..3f603c7 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 \


hooks/post-receive
-- 
GNU Automake