From: Martijn Cuppens <martijn.cuppens@gmail.com>
Date: Tue, 27 Oct 2020 09:36:58 +0000 (+0100)
Subject: Fix git conflicts after #30571 (#31982)
X-Git-Tag: v5.0.0-alpha3~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=642f40db25b05f87de8fef841844593878fe66d8;p=thirdparty%2Fbootstrap.git

Fix git conflicts after #30571 (#31982)

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---

diff --git a/site/content/docs/5.0/migration.md b/site/content/docs/5.0/migration.md
index 6e252b8e51..05851b184f 100644
--- a/site/content/docs/5.0/migration.md
+++ b/site/content/docs/5.0/migration.md
@@ -21,17 +21,12 @@ toc: true
 
 - Introduce `$enable-smooth-scroll`, which applies `scroll-behavior: smooth` globally—except for users asking for reduced motion through `prefers-reduced-motion` media query. [See #31877](https://github.com/twbs/bootstrap/pull/31877)
 
-<<<<<<< HEAD
 ### Forms
 
 - The longstanding [Missing border radius on input group with validation feedback bug](https://github.com/twbs/bootstrap/issues/25110) is finally fixed by adding an additional `.has-validation` class to input groups with validation.
 
 ### Utilities
 
-=======
-### Utilities
-
->>>>>>> Update migration guide for more details, splitting alpha 2 stuff back to the appropriate section in Migration guide
 - **Text utilities:**
   - Added `.fs-*` utilities for `font-size` utilities (with RFS enabled). These use the same scale as HTML's default headings (1-6, large to small), and can be modified via Sass map.
   - Renamed `.font-weight-*` utilities as `.fw-*` for brevity and consistency.