From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 22 Aug 2011 04:06:09 +0000 (-0700)
Subject: fix conflict
X-Git-Tag: v1.1.0~14^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1db73edc5f041eb7f497a23a28da885b2a7867f3;p=thirdparty%2Fbootstrap.git

fix conflict
---

diff --git a/docs/index.html b/docs/index.html
index 6be1192168..384977bb86 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1162,11 +1162,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
               </div>
             </div>
           </div>
-<<<<<<< HEAD
           <img class="large-bird" src="assets/img/bird.png" width="220px" height="145px">
-=======
-          <img class="large-bird" src="assets/img/bird.png" width="220px" height="151px">
->>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1
         </div>
       </div>
     </div>