Fix RootMacro.cmake directory

imorlxs · imorlxs · commit 2d816badfc70 · 2024-08-14T12:51:13.000+02:00
diff --git a/cmake/FindROOT.cmake b/cmake/FindROOT.cmake
@@ -104,8 +104,4 @@ if(NOT BDM_OUT_OF_SOURCE)
   set(LAUNCHER ${CMAKE_BINARY_DIR}/launcher.sh)
 endif()
 
-<<<<<<< HEAD
-include(${CMAKE_SOURCE_DIR}/cmake/RootMacros.cmake)
-=======
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/RootMacros.cmake)
->>>>>>> d4edbbaa (Fix RootMacro.cmake directory)
