Fix Windows build error for the libmexclass integration.

Also, update the register proxy macro used to reflect the libmexclass changes for mathworks/libmexclass#20. Co-authored-by: Fiona la <fionala7@gmail.com>
mathworks · Mar 9, 2023 · 8d535f2 · 8d535f2
1 parent 2b693b0
commit 8d535f2
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt
@@ -327,7 +327,6 @@ matlab_add_mex(R2018a
 target_include_directories(mexcall PRIVATE ${CPP_SOURCE_DIR})
 
 ############# libmexclass #################################
-<<<<<<< HEAD
 message(STATUS "Start configure libmexclass")
 
 message(STATUS "Arrow_FOUND is ${Arrow_FOUND}.")