fix conflict

diff --git a/docs/index.html b/docs/index.html
index 6be1192168dfc7425edb2e7d444dbfc2858b2f0b..384977bb86cf674a75aab8446ae54fd39e989602 100644 (file)
--- 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>