aboutsummaryrefslogtreecommitdiff
path: root/less/bootstrap.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-01-19 17:06:40 -0800
committerMark Otto <[email protected]>2013-01-19 17:06:40 -0800
commitc21c3f101b334fb176b5fc4efd437b7da724e1fc (patch)
tree248b8cb9d1b5f7b8e9e7c27b9f4906bbac959dd2 /less/bootstrap.less
parent64bc5dc91f2a0770d3d563c53600a82f92f53c0f (diff)
parent67ec13a44c945c61735882ce7e78174ea9e32d74 (diff)
downloadbootstrap-c21c3f101b334fb176b5fc4efd437b7da724e1fc.tar.xz
bootstrap-c21c3f101b334fb176b5fc4efd437b7da724e1fc.zip
Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters
Diffstat (limited to 'less/bootstrap.less')
-rw-r--r--less/bootstrap.less2
1 files changed, 1 insertions, 1 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less
index d40984230..0a4dd9ca5 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -49,7 +49,7 @@
@import "alerts.less";
@import "thumbnails.less";
@import "media.less";
-@import "badges.less";
+@import "counters.less";
@import "progress-bars.less";
@import "accordion.less";
@import "carousel.less";