Skip to content

Commit ffc1ebe

Browse files
committed
fix(docker): remove merge conflict marker
1 parent 69e4204 commit ffc1ebe

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

src/docker/itk-wasm-base/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ emscripten_threads_c_flags="-pthread -msimd128 -flto -Wno-warn-absolute-paths -D
6565
emscripten_threads_debug_ld_flags="-pthread -s MALLOC=mimalloc -s PTHREAD_POOL_SIZE=navigator.hardwareConcurrency -fno-lto -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB -Wno-pthreads-mem-growth"
6666
emscripten_threads_debug_c_flags="-pthread -msimd128 -fno-lto -Wno-warn-absolute-paths"
6767

68-
<<<<<<< HEAD
6968
# Handle local ITK source
7069
local_itk_build_arg=""
7170
if [[ -n "$local_itk" ]]; then

0 commit comments

Comments
 (0)