clean up

galabovaa · galabovaa · commit 2a2d01fd5ffe · 2026-01-05T20:49:06.000+02:00
diff --git a/cmake/FindHipoDeps.cmake b/cmake/FindHipoDeps.cmake
@@ -103,10 +103,7 @@ if (BUILD_OPENBLAS)
             set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")
         endif()
 
-<<<<<<< HEAD
 
-=======
->>>>>>> hipo-cpack
         # list(APPEND OPENBLAS_MINIMAL_FLAGS -DUSE_THREAD=OFF)
         list(APPEND OPENBLAS_MINIMAL_FLAGS -DINTERFACE64=0)
 
