diff options
| author | Mark Otto <[email protected]> | 2011-09-02 00:29:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-02 00:29:27 -0700 |
| commit | 1b06f3e84e7f6bc57d2af6c9ffd97a94c911e072 (patch) | |
| tree | c936448c908c3bbcfa8c68db1f7bff0047e48f79 /lib/patterns.less | |
| parent | 479e0ccd6bd4c32c2445e0cb6291c17c5aa4f7a2 (diff) | |
| parent | 3f1706f5f66bd6f4c5ae9fc33224ffdc0a82a261 (diff) | |
| download | bootstrap-1b06f3e84e7f6bc57d2af6c9ffd97a94c911e072.tar.xz bootstrap-1b06f3e84e7f6bc57d2af6c9ffd97a94c911e072.zip | |
resolve conflict
Diffstat (limited to 'lib/patterns.less')
| -rw-r--r-- | lib/patterns.less | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index 03f31e0fe..260eb87f4 100644 --- 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; |