diff options
| author | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:25:42 +0000 |
|---|---|---|
| committer | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:25:42 +0000 |
| commit | 910bf8e2868318dc89f560295d29d1fbac75dd35 (patch) | |
| tree | e763c7e01bbfca15a1fa0adb35abafb6598eb1ff /old/art.html | |
| parent | e6ecafcb6dc2ae42d28c820fa81c49110bab2b5a (diff) | |
| parent | 5024f0d9fcc8426c7c48a7ce0b4cc86485921bd8 (diff) | |
Merge branch 'main' of github.com:radiohotline/softmachine.dev
Diffstat (limited to 'old/art.html')
| -rw-r--r-- | old/art.html | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/old/art.html b/old/art.html index 06bb939..5d951fd 100644 --- a/old/art.html +++ b/old/art.html @@ -61,31 +61,19 @@ <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> |