2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

resolve conflict

This commit is contained in:
Mark Otto
2011-09-02 22:09:49 -07:00
16 changed files with 1142 additions and 115 deletions
+7
View File
@@ -93,6 +93,13 @@ body {
}
}
.hide {
display: none;
}
.show {
display: block;
}
// BASE STYLES
// -----------