diff options
| author | Mark Otto <[email protected]> | 2011-09-02 22:09:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-02 22:09:49 -0700 |
| commit | 6d118411e1d456553baf5d09aea15ff13f7b8ef4 (patch) | |
| tree | ef84a750770f0b2efee65e204c3085e94cf8f120 /docs/assets/css/docs.css | |
| parent | 162534139170e3416cb33a5b5c5093d4a2a5e8f0 (diff) | |
| parent | 3c9c85b1ed85ae633d4b94f421020b84d24d9a5c (diff) | |
| download | bootstrap-6d118411e1d456553baf5d09aea15ff13f7b8ef4.tar.xz bootstrap-6d118411e1d456553baf5d09aea15ff13f7b8ef4.zip | |
resolve conflict
Diffstat (limited to 'docs/assets/css/docs.css')
| -rw-r--r-- | docs/assets/css/docs.css | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index bdb655b1a..f72cd3953 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -130,6 +130,7 @@ div.quickstart form textarea { #footer p.right { float: right; } + /* Special grid styles -------------------------------------------------- */ .show-grid { |