diff options
| author | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
|---|---|---|
| committer | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
| commit | 9aeaf19b1dca68ee71e916ae415a0c270a47d301 (patch) | |
| tree | bc8385acb8ec7a46bba03ff2ef7e4283cd9f1146 /docs/examples/carousel/carousel.css | |
| parent | e7991a9a1e2f474c8f1d8a2e0ed113816f1c5e82 (diff) | |
| parent | 35f09315ed543a0479719afa2143240952c215db (diff) | |
| download | bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.tar.xz bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.zip | |
Merge remote-tracking branch 'upstream/master' into node-requirable
Conflicts:
Gruntfile.js
Diffstat (limited to 'docs/examples/carousel/carousel.css')
| -rw-r--r-- | docs/examples/carousel/carousel.css | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css index bd7567af3..a5143f5e0 100644 --- a/docs/examples/carousel/carousel.css +++ b/docs/examples/carousel/carousel.css @@ -100,7 +100,6 @@ body { -------------------------------------------------- */ @media (min-width: 768px) { - /* Navbar positioning foo */ .navbar-wrapper { margin-top: 20px; |