From 9a5a27c9ac75b5f92314f0b928b22f2b7328c12e Mon Sep 17 00:00:00 2001
From: Minh Bui <m.bui@anu.edu.au>
Date: Thu, 6 Feb 2025 13:47:04 +1100
Subject: [PATCH] resolve conflict

---
 CMakeLists.txt | 2 +-
 lsd2           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dacc487c..30ab00b14 100644
--- 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
index 125720d9d..c61110f3a 160000
--- a/lsd2
+++ b/lsd2
@@ -1 +1 @@
-Subproject commit 125720d9da1281642053713d9b094d5bff2ce9cf
+Subproject commit c61110f3a4fa05325b45c97b2134792ff9d55d4c