diff options
Diffstat (limited to 'old/links.html')
| -rw-r--r-- | old/links.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/old/links.html b/old/links.html index 1153d12..dc7c321 100644 --- a/old/links.html +++ b/old/links.html @@ -166,7 +166,11 @@ <br> <div style="text-align: center;"> +<<<<<<< HEAD <img src="../img/objects/ducks.gif" alt="3D GIF of a duck and her ducklings."> +======= + <img src="../img/objects/ducks.gif" alt="3D GIF of a duck and her ducklings."> +>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div> </div> |