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