move comment so less compiles

2026-04-24 03:00:49 -04:00 · 2011-09-02 00:29:54 -07:00
parent 1b06f3e84e
commit 5ef4519ca8
3 changed files with 2194 additions and 5 deletions
--- 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
-.topbar > ul, // For backwards compatability
+// For backwards compatability, leave in .topbar > .ul
+.topbar > ul,
 .nav {
-=======
-.topbar > ul, .nav {
->>>>>>> 3f1706f5f66bd6f4c5ae9fc33224ffdc0a82a261
  display: block;
  float: left;
  margin: 0 10px 0 0;