Forgot merge line

CMakeLists.txt

@@ -352,6 +352,5 @@ if(STORM_PYTHON)
 endif()
 
 add_subdirectory(src)
-add_subdirectory(test)
 
 include(StormCPackConfig.cmake)

resources/3rdparty/CMakeLists.txt

@@ -217,7 +217,6 @@ if(USE_CARL)
                 GIT_TAG master
                 INSTALL_DIR ${STORM_3RDPARTY_BINARY_DIR}/carl
                 SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/carl
-<<<<<<< 7a34e7a497653a308b2771531a8090f92dbd65b7
 		        CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DBOOST_INCLUDEDIR=${Boost_INCLUDE_DIRS} -DBOOST_LIBRARYDIR=${Boost_LIBRARY_DIRS} -DBoost_NO_SYSTEM_PATHS=1 -DEXPORT_TO_CMAKE=0 -DUSE_CLN_NUMBERS=1 -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=1 -DCMAKE_INSTALL_PREFIX:PATH=${STORM_3RDPARTY_BINARY_DIR}/carl -DBINDINGS_PYTHON=${STORM_PYTHON} -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
                 BUILD_IN_SOURCE 0
                 BUILD_COMMAND ${CARL_BUILD_COMMAND}