resolve conflict

2026-05-27 14:46:01 +03:00 · 2011-09-02 00:29:27 -07:00
parent 479e0ccd6b 3f1706f5f6
commit 1b06f3e84e
3 changed files with 4 additions and 2192 deletions
@@ -109,8 +109,12 @@

 // Topbar Nav
 // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
+<<<<<<< HEAD
 .topbar > ul, // For backwards compatability
 .nav {
+=======
+.topbar > ul, .nav {
+>>>>>>> 3f1706f5f66bd6f4c5ae9fc33224ffdc0a82a261
  display: block;
  float: left;
  margin: 0 10px 0 0;