Skip to content
Browse files

fix conflict

  • Loading branch information...
1 parent 17f9aca commit 1db73edc5f041eb7f497a23a28da885b2a7867f3 @fat fat committed
Showing with 0 additions and 4 deletions.
  1. +0 −4 docs/index.html
View
4 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>

0 comments on commit 1db73ed

Please sign in to comment.
Something went wrong with that request. Please try again.