Commit 0cd20f12 authored by Jan Möbius's avatar Jan Möbius

Merge conflict

parent 5e01ec7b
......@@ -78,8 +78,4 @@ find_package_handle_standard_args(CLP DEFAULT_MSG
mark_as_advanced(CLP_INCLUDE_DIR CLP_LIBRARY)
<<<<<<< HEAD
endif(NOT CLP_FOUND)
=======
endif( NOT CLP_FOUND)
>>>>>>> de50b89d4c22e69eb9f024dd18a994331b44d056
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