Update CMakeLists.txt

JensUweUlrich · Mar 16, 2022 · 9bb5801 · 9bb5801
1 parent 68b63d2
commit 9bb5801
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/basecaller/Guppy/CMakeLists.txt b/src/basecaller/Guppy/CMakeLists.txt
@@ -36,19 +36,13 @@ else()
       set_target_properties(GuppyClient PROPERTIES 
         IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libGuppyCppClient_gcc-8.a"
       )
-<<<<<<< HEAD
   elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
       set_target_properties(GuppyClient PROPERTIES 
         IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libGuppyCppClient_gcc-9.a"
       )
   else()
       set_target_properties(GuppyClient PROPERTIES 
         IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libGuppyCppClient_gcc-10.a"
-=======
-  else()
-      set_target_properties(GuppyClient PROPERTIES 
-        IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libGuppyCppClient_gcc-9.a"
->>>>>>> master
       )
   endif()
 endif()