diff options
| author | Jacob Thornton <[email protected]> | 2011-08-21 21:06:09 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-08-21 21:06:09 -0700 |
| commit | 1db73edc5f041eb7f497a23a28da885b2a7867f3 (patch) | |
| tree | 8ff89987d6f3f72f01c545f0f460fd4d177b5086 /docs | |
| parent | 17f9aca6988d12559cefa76469f6e7b179265313 (diff) | |
| download | bootstrap-1db73edc5f041eb7f497a23a28da885b2a7867f3.tar.xz bootstrap-1db73edc5f041eb7f497a23a28da885b2a7867f3.zip | |
fix conflict
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> |