Fix git conflicts after #30571 (!31982) · Merge requests · Bootstrap / bootstrap · GitLab

Merged Administrator requested to merge main-mc-migrations-fix into main Oct 27, 2020

Created by: MartijnCuppens

Introduced here https://github.com/twbs/bootstrap/pull/30571/files#diff-582480d4813d58a3ed1225fb8cafd661e0ccc2a12d08a5f4c1812e06148977d4