nuke rogue conflict comment and remake

28e17020 · Mark Otto · 43da258b · 28e17020 · 28e17020
Commit 28e17020 authored 12 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 4705 additions and 1 deletion
+4705 -1
--- 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,