diff options
| author | Mark Otto <[email protected]> | 2012-11-22 22:04:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-22 22:04:21 -0800 |
| commit | 7e56e2265d67ae81ad8be52af4d56f189929207a (patch) | |
| tree | 8bede49f32e25f4acfe95a2a7cc86bd273805474 /less/reset.less | |
| parent | fa1c130552022520161a2b0c595e2ca431df0c97 (diff) | |
| parent | e0d0190803398ce12b2fe88e31e45993b35cf17e (diff) | |
| download | bootstrap-7e56e2265d67ae81ad8be52af4d56f189929207a.tar.xz bootstrap-7e56e2265d67ae81ad8be52af4d56f189929207a.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
less/button-groups.less
Diffstat (limited to 'less/reset.less')
| -rw-r--r-- | less/reset.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/less/reset.less b/less/reset.less index d26b2a2ae..fa0be26c0 100644 --- a/less/reset.less +++ b/less/reset.less @@ -1,5 +1,5 @@ // -// Modals +// Reset CSS // Adapted from http://github.com/necolas/normalize.css // -------------------------------------------------- |