root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

nuke rogue conflict comment and remake

This commit is contained in:
Mark Otto 2013-02-05 19:59:02 -08:00
parent 43da258bd9
commit 28e1702052
2 changed files with 4705 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4705
docs/assets/css/bootstrap.css vendored
View File

File diff suppressed because it is too large Load Diff

1
less/mixins.less
View File

@ -394,7 +394,6 @@
border-bottom: 1px solid @bottom; border-bottom: 1px solid @bottom;
} }
<<<<<<< HEAD
// Button psuedo states // Button psuedo states
// ------------------------- // -------------------------
// Easily pump out default styles, as well as :hover, :focus, :active, // Easily pump out default styles, as well as :hover, :focus, :active,