summaryrefslogtreecommitdiff
path: root/old/poetry.html
diff options
context:
space:
mode:
Diffstat (limited to 'old/poetry.html')
-rw-r--r--old/poetry.html6
1 files changed, 5 insertions, 1 deletions
diff --git a/old/poetry.html b/old/poetry.html
index cdc4299..456b98f 100644
--- a/old/poetry.html
+++ b/old/poetry.html
@@ -190,7 +190,11 @@
</div>
<div style="text-align: center;">
- <img src="img/objects/snailcircle.gif" alt="A gif of a snail going in a circle">
+<<<<<<< HEAD
+ <img src="../img/objects/snailcircle.gif" alt="A gif of a snail going in a circle">
+=======
+ <img src="../img/objects/snailcircle.gif" alt="A gif of a snail going in a circle">
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
</div>
</body>
</html>