Permalink
Browse files

resolve conflicts in merging in other branch

  • Loading branch information...
2 parents dd4bb95 + 2d99e3f commit 8c2df3ac3ad2c4d87e0057bc76986e902cd2959b @mdo mdo committed Aug 26, 2011
Showing with 697 additions and 264 deletions.
  1. +262 −69 bootstrap-1.1.0.css
  2. +63 −37 bootstrap-1.1.0.min.css
  3. +153 −153 lib/forms.less
  4. +1 −0 lib/patterns.less
  5. +128 −4 lib/reset.less
  6. +86 −0 lib/scaffolding.less
  7. +4 −1 lib/type.less
Oops, something went wrong.

0 comments on commit 8c2df3a

Please sign in to comment.