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/archive.html | |
| parent | e6ecafcb6dc2ae42d28c820fa81c49110bab2b5a (diff) | |
| parent | 5024f0d9fcc8426c7c48a7ce0b4cc86485921bd8 (diff) | |
Merge branch 'main' of github.com:radiohotline/softmachine.dev
Diffstat (limited to 'old/archive.html')
| -rw-r--r-- | old/archive.html | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/old/archive.html b/old/archive.html index e05e643..d79441f 100644 --- a/old/archive.html +++ b/old/archive.html @@ -31,7 +31,6 @@ <div class="art-container"> <h4>2025</h4> -<<<<<<< HEAD <img loading="lazy" src="../img/art/2025/jojomart.jpeg"> <img loading="lazy" src="../img/art/2025/bikeghost.jpg"> <h4>2024</h4> @@ -51,27 +50,6 @@ <img loading="lazy" src="../img/art/2021/IMG_20211225_210622.jpg"> <img loading="lazy" src="../img/art/2021/IMG_20211223_202541.jpg"> <img loading="lazy" src="../img/art/2021/IMG_20210311_170418.jpg"> -======= - <img loading="lazy" src="../img/art/2025/jojomart.jpeg"> - <img loading="lazy" src="../img/art/2025/bikeghost.jpg"> - <h4>2024</h4> - <img loading="lazy" src="../img/art/2024/aphrodite.jpg"> - <h4>2023</h4> - <img loading="lazy" src="../img/art/2023/mobpsychofinal2.png"> - <img loading="lazy" src="../img/art/2023/mart.jpg"> - <img loading="lazy" src="../img/art/2023/mind_parasite.png"> - <h4>2022</h4> - <img loading="lazy" src="../img/art/2022/IMG_20240718_224050.jpg"> - <img loading="lazy" src="../img/art/2022/seki.jpg"> - <img loading="lazy" src="../img/art/2022/link.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20220829_203310.jpg"> - <img loading="lazy" src="../img/art/2022/IMG_20220127_205955.jpg"> - <h4>2021</h4> - <img loading="lazy" src="../img/art/2021/2021satoru.jpg"> - <img loading="lazy" src="../img/art/2021/IMG_20211225_210622.jpg"> - <img loading="lazy" src="../img/art/2021/IMG_20211223_202541.jpg"> - <img loading="lazy" src="../img/art/2021/IMG_20210311_170418.jpg"> ->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </div> </body> </html> |