diff options
| author | Mark Otto <[email protected]> | 2013-08-17 17:31:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 17:31:58 -0700 |
| commit | ba20e512ce53e7cc771ba06d492a01d48db6cc97 (patch) | |
| tree | 30cebcbb796725c7dc06c9125714d83adbf585c3 /less/bootstrap.less | |
| parent | 2af9cf10ce2e93fe0ac07651d405abc484e4c608 (diff) | |
| parent | e29c23afab2577e05cfaa41f64a20f1ca87222fc (diff) | |
| download | bootstrap-ba20e512ce53e7cc771ba06d492a01d48db6cc97.tar.xz bootstrap-ba20e512ce53e7cc771ba06d492a01d48db6cc97.zip | |
Merge branch '3.0.0-wip' into bs3_theme
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 102d5b0c7..771eb32d1 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -54,7 +54,6 @@ @import "labels.less"; @import "badges.less"; @import "progress-bars.less"; -@import "accordion.less"; @import "carousel.less"; @import "jumbotron.less"; |