From 613724fa9f1be39ee770b037d213d8bf828977f9 Mon Sep 17 00:00:00 2001
From: sjunges <sebastian.junges@rwth-aachen.de>
Date: Wed, 5 Aug 2015 17:04:13 +0200
Subject: [PATCH] fix

Former-commit-id: 2e0bdc126870a2db364bfc195d1e44be61b49c5e
---
 CMakeLists.txt | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c426b531..a1b8c29b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -579,10 +579,7 @@ endif(STORM_HAVE_Z3)
 if(STORM_HAVE_CARL)
     message(STATUS "StoRM - Linking with carl.")
     include_directories("${carl_INCLUDE_DIR}")
-<<<<<<< HEAD
     target_link_libraries(storm ${carl_LIBRARIES})
-    target_link_libraries(storm-functional-tests ${carl_LIBRARIES})
-    target_link_libraries(storm-performance-tests ${carl_LIBRARIES})
 endif()
 
 #############################################################
@@ -595,11 +592,6 @@ if(STORM_HAVE_SMTRAT)
 message(STATUS "StoRM - Linking with smtrat.")
     include_directories("${smtrat_INCLUDE_DIR}")
     target_link_libraries(storm ${smtrat_LIBRARIES})
-    target_link_libraries(storm-functional-tests ${smtrat_LIBRARIES})
-    target_link_libraries(storm-performance-tests ${smtrat_LIBRARIES})
-=======
-    target_link_libraries(storm lib_carl)
->>>>>>> master
 endif()
 
 #############################################################