From: Mark Otto <markdotto@gmail.com>
Date: Sun, 9 Oct 2016 22:08:34 +0000 (-0700)
Subject: fix bad merge
X-Git-Tag: v4.0.0-alpha.5~4^2~17^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=750a9d7d80119a03cd2d8f178429b2e021551356;p=thirdparty%2Fbootstrap.git

fix bad merge
---

diff --git a/docs/components/navbar.md b/docs/components/navbar.md
index 4f791daf5e..e26097da9d 100644
--- a/docs/components/navbar.md
+++ b/docs/components/navbar.md
@@ -307,7 +307,6 @@ Our collapse plugin allows you to use a `<button>` or `<a>` to toggle hidden con
 <nav class="navbar navbar-light bg-faded">
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar" aria-controls="exCollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"></button>
   <div class="collapse" id="exCollapsingNavbar">
-    <div class="bg-inverse text-muted p-a-1">
     <div class="bg-inverse text-muted p-1">
       <h4>Collapsed content</h4>
       <span class="text-muted">Toggleable via the navbar brand.</span>