diff options
| author | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:12:37 +0000 |
|---|---|---|
| committer | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:12:37 +0000 |
| commit | 223ef7acb24356fca6cf5ab40c02b43a09452093 (patch) | |
| tree | d845297a50e78f9ca9c37c113b78b8a2aaa1c138 /old/art.html | |
| parent | cae6b00e0f3352a323af2400bf7f9deb7460c7de (diff) | |
| parent | 37522616a3efcaa3c7b40821155e8f1fff5c9985 (diff) | |
about
Diffstat (limited to 'old/art.html')
| -rw-r--r-- | old/art.html | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/old/art.html b/old/art.html index 5d951fd..06bb939 100644 --- a/old/art.html +++ b/old/art.html @@ -61,19 +61,31 @@ <div> <p>Doodles</p> <a href="doodle.html"> +<<<<<<< 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"> +<<<<<<< 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"> +<<<<<<< HEAD + <img src="../img/art/full.jpg" alt="Complete"> +======= <img src="../img/art/full.jpg" alt="Complete"> +>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </a> </div> </div> |