fix conflict

twbs · Aug 22, 2011 · 1db73ed · 1db73ed
1 parent 17f9aca
commit 1db73ed
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -1162,11 +1162,7 @@ <h3 class="title">Popover Title</h3>
               </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>