diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/index.html b/docs/index.html index 6be119216..384977bb8 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> |