nuke rogue conflict comment and remake

2013-02-05 19:59:02 -08:00 · 2013-02-05 19:59:02 -08:00 · 28e1702052
parent 43da258bd9
commit 28e1702052
2 changed files with 4705 additions and 1 deletions
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
--- a/less/mixins.less
+++ b/less/mixins.less
@ -394,7 +394,6 @@
  border-bottom: 1px solid @bottom;
 }

-<<<<<<< HEAD
 // Button psuedo states
 // -------------------------
 // Easily pump out default styles, as well as :hover, :focus, :active,