resolve conflict

1b06f3e8 · Mark Otto · 479e0ccd · 3f1706f5 · 1b06f3e8 · 1b06f3e8
Commit 1b06f3e8 authored Sep 02, 2011 by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2192 deletions

bootstrap-1.2.0.css bootstrap-1.2.0.css +0 -1930

bootstrap-1.2.0.min.css bootstrap-1.2.0.min.css +0 -262

lib/patterns.less lib/patterns.less +4 -0

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