diff --git a/src/scripts/merge_tools/merging b/src/scripts/merge_tools/merging index 242283f32e..b636e7c829 160000 --- a/src/scripts/merge_tools/merging +++ b/src/scripts/merge_tools/merging @@ -1 +1 @@ -Subproject commit 242283f32e19424ddef3de5b49939ed1bef9a6fe +Subproject commit b636e7c82930df750a324c20ce8f99610cc2751b