fix conflict

1db73edc · Jacob Thornton · 17f9aca6 · 1db73edc
Commit 1db73edc authored 13 years ago by Jacob Thornton
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 4 deletions
+0 -4
--- 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>