aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-10-09 15:08:34 -0700
committerMark Otto <[email protected]>2016-10-09 15:08:34 -0700
commit750a9d7d80119a03cd2d8f178429b2e021551356 (patch)
treec35f4085593bf7898ee8ab6e0fe2815ba3c47e05 /docs
parent7dee5560a10785100996fb6affe644163b2db44e (diff)
downloadbootstrap-750a9d7d80119a03cd2d8f178429b2e021551356.tar.xz
bootstrap-750a9d7d80119a03cd2d8f178429b2e021551356.zip
fix bad merge
Diffstat (limited to 'docs')
-rw-r--r--docs/components/navbar.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/components/navbar.md b/docs/components/navbar.md
index 4f791daf5..e26097da9 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>