From f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Sun, 21 Aug 2011 20:56:06 -0700
Subject: more tweaks to resolve some missed conflicts

---
 docs/index.html | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

(limited to 'docs')

diff --git a/docs/index.html b/docs/index.html
index 983ea7d87..263ccc3ed 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -900,35 +900,12 @@
   <div class="page-header">
     <h1>Navigation</h1>
   </div>
+
   <h2>Fixed topbar</h2>
   <div class="topbar-wrapper" style="z-index: 5;">
     <div class="topbar">
-      <div class="container">
-        <h3><a href="#">Project Name</a></h3>
-        <ul>
-          <li class="active"><a href="#">Home</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-        </ul>
-        <form action="">
-          <input type="text" placeholder="Search" />
-        </form>
-        <ul class="nav secondary-nav">
-          <li class="menu">
-            <a href="#" class="menu">Dropdown</a>
-            <ul class="menu-dropdown">
-              <li><a href="#">Secondary link</a></li>
-              <li><a href="#">Something else here</a></li>
-              <li class="divider"></li>
-              <li><a href="#">Another link</a></li>
-            </ul>
-          </li>
-        </ul>
-=======
->>>>>>> .merge_file_ugVE3k
       <div class="fill">
-        <div class="container fixed">
+        <div class="container">
           <h3><a href="#">Project Name</a></h3>
           <ul>
             <li class="active"><a href="#">Home</a></li>
@@ -951,9 +928,10 @@
             </li>
           </ul>
         </div>
-      </div>
-    </div>
+      </div> <!-- /fill -->
+    </div> <!-- /topbar -->
   </div> <!-- topbar-wrapper -->
+
   <div class="row">
     <div class="span5 columns">
       <h4>What is it</h4>
-- 
cgit v1.2.3