summaryrefslogtreecommitdiff
path: root/old/art.html
diff options
context:
space:
mode:
authorradiohotline <radiohotline@disroot.org>2026-02-17 15:05:27 +0300
committerradiohotline <radiohotline@disroot.org>2026-02-17 15:05:27 +0300
commit37522616a3efcaa3c7b40821155e8f1fff5c9985 (patch)
treefeb31bee8cc32fd7310559701e39719b2c6c096b /old/art.html
parent435aeb674198769b61b0ee8d82f85a108bacf49e (diff)
parent60eb045c37c24677088f13cdded9408c292f65ff (diff)
maintainence
Diffstat (limited to 'old/art.html')
-rw-r--r--old/art.html18
1 files changed, 15 insertions, 3 deletions
diff --git a/old/art.html b/old/art.html
index 8616484..06bb939 100644
--- a/old/art.html
+++ b/old/art.html
@@ -61,19 +61,31 @@
<div>
<p>Doodles</p>
<a href="doodle.html">
- <img src="img/art/doodle.png" alt="Doodles">
+<<<<<<< HEAD
+ <img src="../img/art/doodle.png" alt="Doodles">
+=======
+ <img src="../img/art/doodle.png" alt="Doodles">
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
</a>
</div>
<div>
<p>Sketches</p>
<a href="sketch.html">
- <img src="img/art/sketch.jpg" alt="Sketches">
+<<<<<<< HEAD
+ <img src="../img/art/sketch.jpg" alt="Sketches">
+=======
+ <img src="../img/art/sketch.jpg" alt="Sketches">
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
</a>
</div>
<div>
<p style="background-color: rgba(255, 255, 255, 0.5);">Completed</p>
<a href="archive.html">
- <img src="img/art/full.jpg" alt="Complete">
+<<<<<<< HEAD
+ <img src="../img/art/full.jpg" alt="Complete">
+=======
+ <img src="../img/art/full.jpg" alt="Complete">
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
</a>
</div>
</div>