resolve conflict

iqtree · Feb 6, 2025 · 9a5a27c · 9a5a27c
1 parent ac2dce7
commit 9a5a27c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -237,7 +237,7 @@ elseif (APPLE)
             # supports the first version changed from OS X to macOS
         	add_definitions("--target=x86_64-apple-macos10.12")
             set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12)
-        	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --target=x86_64-apple-macos10.12")
+            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --target=x86_64-apple-macos10.12")
     	endif()
 	endif()
     SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})

diff --git a/lsd2 b/lsd2