2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00

resolve conflict

This commit is contained in:
Mark Otto
2011-09-08 23:02:13 -07:00
11 changed files with 190 additions and 66 deletions
+10
View File
@@ -401,6 +401,16 @@ a.menu:after,
}
}
.tab-content > *,
.pill-content > * {
display: none;
}
.tab-content > .active,
.pill-content > .active {
display:block;
}
// BREADCRUMBS
// -----------