diff options
| author | Mark Otto <[email protected]> | 2013-08-13 13:48:33 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-13 13:48:33 -0700 |
| commit | bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3 (patch) | |
| tree | 2a59b9815cb02226a694c345cf942c9ad869810f /less/bootstrap.less | |
| parent | 3c772b1cebfed73570247691917b40fcf3d95aa2 (diff) | |
| parent | a8769b8cab1799168b31f1a5afd403f323a6b6d4 (diff) | |
| download | bootstrap-bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3.tar.xz bootstrap-bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3.zip | |
Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/bootstrap.less')
| -rw-r--r-- | less/bootstrap.less | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index b7f393d7a..accfb92e4 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -55,7 +55,6 @@ @import "labels.less"; @import "badges.less"; @import "progress-bars.less"; -@import "accordion.less"; @import "carousel.less"; @import "jumbotron.less"; |