diff --git a/src/scripts/merge_tools/merging b/src/scripts/merge_tools/merging index dfa28f8954..54b3dccf20 160000 --- a/src/scripts/merge_tools/merging +++ b/src/scripts/merge_tools/merging @@ -1 +1 @@ -Subproject commit dfa28f8954956fb952805cc1fb628287475a855a +Subproject commit 54b3dccf20f8baba0e63679babb1edf363b24f2d