Clean up merge problem

This commit is contained in:
William S Fulton 2018-05-24 19:18:55 +01:00
commit cbaf6eb2b3

View file

@ -76,7 +76,6 @@ java_nspacewithoutpackage.%: JAVA_PACKAGEOPT =
multiple_inheritance_nspace.%: JAVA_PACKAGE = $*Package
nspace.%: JAVA_PACKAGE = $*Package
nspace_extend.%: JAVA_PACKAGE = $*Package
doxygen_misc_constructs.%: INCLUDES = -I../$(srcdir)/..
# Rules for the different types of tests
%.cpptest: