summaryrefslogtreecommitdiff
path: root/old/poetry.html
diff options
context:
space:
mode:
authorRadiohotline <radiohotline@disroot.org>2026-02-17 12:12:37 +0000
committerRadiohotline <radiohotline@disroot.org>2026-02-17 12:12:37 +0000
commit223ef7acb24356fca6cf5ab40c02b43a09452093 (patch)
treed845297a50e78f9ca9c37c113b78b8a2aaa1c138 /old/poetry.html
parentcae6b00e0f3352a323af2400bf7f9deb7460c7de (diff)
parent37522616a3efcaa3c7b40821155e8f1fff5c9985 (diff)
about
Diffstat (limited to 'old/poetry.html')
-rw-r--r--old/poetry.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/old/poetry.html b/old/poetry.html
index d5065cf..456b98f 100644
--- a/old/poetry.html
+++ b/old/poetry.html
@@ -190,7 +190,11 @@
</div>
<div style="text-align: center;">
+<<<<<<< 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>