summaryrefslogtreecommitdiff
path: root/old/links.html
diff options
context:
space:
mode:
Diffstat (limited to 'old/links.html')
-rw-r--r--old/links.html6
1 files changed, 5 insertions, 1 deletions
diff --git a/old/links.html b/old/links.html
index 974f9df..dc7c321 100644
--- a/old/links.html
+++ b/old/links.html
@@ -166,7 +166,11 @@
<br>
<div style="text-align: center;">
- <img src="img/objects/ducks.gif" alt="3D GIF of a duck and her ducklings.">
+<<<<<<< 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>