root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix conflict

This commit is contained in:
Jacob Thornton 2011-08-21 21:06:09 -07:00
parent 17f9aca698
commit 1db73edc5f
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/index.html
View File

@ -1162,11 +1162,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</div> </div>
</div> </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="145px">
=======
<img class="large-bird" src="assets/img/bird.png" width="220px" height="151px">
>>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1
</div> </div>
</div> </div>
</div> </div>