2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

resolve conflicts

This commit is contained in:
Mark Otto
2011-09-02 00:52:22 -07:00
5 changed files with 27 additions and 23 deletions
-1
View File
@@ -905,7 +905,6 @@
<div class="page-header">
<h1>Navigation</h1>
</div>
<h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar">