Clean up merge problem
This commit is contained in:
parent
fdade90ac8
commit
cbaf6eb2b3
1 changed files with 0 additions and 1 deletions
|
|
@ -76,7 +76,6 @@ java_nspacewithoutpackage.%: JAVA_PACKAGEOPT =
|
||||||
multiple_inheritance_nspace.%: JAVA_PACKAGE = $*Package
|
multiple_inheritance_nspace.%: JAVA_PACKAGE = $*Package
|
||||||
nspace.%: JAVA_PACKAGE = $*Package
|
nspace.%: JAVA_PACKAGE = $*Package
|
||||||
nspace_extend.%: JAVA_PACKAGE = $*Package
|
nspace_extend.%: JAVA_PACKAGE = $*Package
|
||||||
doxygen_misc_constructs.%: INCLUDES = -I../$(srcdir)/..
|
|
||||||
|
|
||||||
# Rules for the different types of tests
|
# Rules for the different types of tests
|
||||||
%.cpptest:
|
%.cpptest:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue