nuke rogue conflict comment and remake

28e17020 · Mark Otto · 43da258b · 28e17020 · 28e17020
Commit 28e17020 authored Feb 05, 2013 by Mark Otto
Expand all Show whitespace changes
Inline Side-by-side

Showing with 4705 additions and 1 deletion

docs/assets/css/bootstrap.css docs/assets/css/bootstrap.css +4705 -0

less/mixins.less less/mixins.less +0 -1

No files found.
--- 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,