Commit 86d502b3 authored by Brian Panneton's avatar Brian Panneton Committed by Kenneth Leiter

FIX: Fixed Merge Mistake

parent c0de4662
......@@ -18,7 +18,6 @@ GET_PROPERTY(java_ldpath GLOBAL PROPERTY JAVA_TEST_LDPATH)
SET_PROPERTY(GLOBAL PROPERTY JAVA_TEST_LDPATH
"${java_ldpath}"
)
>>>>>>> FIX: Corrected SWIG overriding equals for Java and Python
# Include our test macros
include (UseJavaTest)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment