Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xdmf
Xdmf
Commits
86d502b3
Commit
86d502b3
authored
Sep 09, 2010
by
Brian Panneton
Committed by
Kenneth Leiter
Sep 23, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FIX: Fixed Merge Mistake
parent
c0de4662
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
1 deletion
+0
-1
tests/Java/CMakeLists.txt
tests/Java/CMakeLists.txt
+0
-1
No files found.
tests/Java/CMakeLists.txt
View file @
86d502b3
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment