move comment so less compiles

5ef4519c · Mark Otto · 1b06f3e8 · 5ef4519c · 5ef4519c · 5ef4519c
Commit 5ef4519c authored 13 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 2194 additions and 5 deletions
+2194 -5
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.css
--- a/bootstrap-1.2.0.min.css
+++ b/bootstrap-1.2.0.min.css
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -109,12 +109,9 @@
 // Topbar Nav
 // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
-<<<<<<< HEAD
+// For backwards compatability, leave in .topbar > .ul
-.topbar > ul, // For backwards compatability
+.topbar > ul,
 .nav {
-=======
-.topbar > ul, .nav {
->>>>>>> 3f1706f5f66bd6f4c5ae9fc33224ffdc0a82a261
  display: block;
  float: left;
  margin: 0 10px 0 0;