FIX: Fixed Merge Mistake

86d502b3 · Brian Panneton · Kenneth Leiter · c0de4662 · 86d502b3
Commit 86d502b3 authored Sep 09, 2010 by Brian Panneton Committed by Kenneth Leiter Sep 23, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

tests/Java/CMakeLists.txt tests/Java/CMakeLists.txt +0 -1

No files found.
--- a/tests/Java/CMakeLists.txt
+++ b/tests/Java/CMakeLists.txt
@@ -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)