From 5024f0d9fcc8426c7c48a7ce0b4cc86485921bd8 Mon Sep 17 00:00:00 2001
From: radiohotline <radiohotline@disroot.org>
Date: Tue, 17 Feb 2026 15:23:50 +0300
Subject: merge

---
 old/sketch.html | 56 --------------------------------------------------------
 1 file changed, 56 deletions(-)

(limited to 'old/sketch.html')

diff --git a/old/sketch.html b/old/sketch.html
index fbd4133..90614a3 100644
--- a/old/sketch.html
+++ b/old/sketch.html
@@ -31,7 +31,6 @@
 
     <div class="art-container">
         <h4>2025</h4>
-<<<<<<< HEAD
 	<img loading="lazy" src="../img/art/2025/s1.jpg">
 	<img loading="lazy" src="../img/art/2025/s5.jpg">
 	<img loading="lazy" src="../img/art/2025/i1.jpg">
@@ -85,61 +84,6 @@
         <img loading="lazy" src="../img/art/2022/IMG_20220226_183246.jpg">
         <h4>2021</h4>
         <img loading="lazy" src="../img/art/2021/IMG_20210721_115209.jpg">
-=======
-	<img loading="lazy" src="../img/art/2025/s1.jpg">
-	<img loading="lazy" src="../img/art/2025/s5.jpg">
-	<img loading="lazy" src="../img/art/2025/i1.jpg">
-	<img loading="lazy" src="../img/art/2025/i2.jpg">
-	<img loading="lazy" src="../img/art/2025/i3.jpg">
-	<img loading="lazy" src="../img/art/2025/h6.jpg">
-	<img loading="lazy" src="../img/art/2025/bikeghostsketch.jpeg">
-	<img loading="lazy" src="../img/art/2025/jojosketches.jpeg">
-        <img loading="lazy" src="../img/art/2025/IMG_20250225_190627.jpg">
-        <img loading="lazy" src="../img/art/2025/IMG_20250225_190657.jpg">
-        <img loading="lazy" src="../img/art/2025/IMG_20250225_190853.jpg">
-        <h4>2024</h4>
-	<img loading="lazy" src="../img/art/2024/IMG_20240718_224634.jpg">
-        <img loading="lazy" src="../img/art/2024/2024 - April13 molochcats.png">
-        <img loading="lazy" src="../img/art/2024/wigeon.png">
-        <img loading="lazy" src="../img/art/2024/mithrun1.jpg">
-        <img loading="lazy" src="../img/art/2024/gamescreenshot.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224748.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224728.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224718.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224652.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224646.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224629.jpg">
-        <img loading="lazy" src="../img/art/2024/ardennaaaa.png">
-        <img loading="lazy" src="../img/art/2024/2024 - February16 posterwip.png">
-        <img loading="lazy" src="../img/art/2024/2024 - Februrary 2.jpg">
-        <img loading="lazy" src="../img/art/2024/2024 - February.jpg">
-        <h4>2023</h4>
-	<img loading="lazy" src="../img/art/2023/duck.png">
-        <img loading="lazy" src="../img/art/2023/September28 - dino.png">
-        <img loading="lazy" src="../img/art/2023/September10 - alien.jpg">
-        <img loading="lazy" src="../img/art/2023/IMG_20240718_224241.jpg">
-        <img loading="lazy" src="../img/art/2023/IMG_20230705_174343.jpg">
-        <img loading="lazy" src="../img/art/2023/IMG_20230809_181215_edit_447859372544680.jpg">
-        <img loading="lazy" src="../img/art/2023/July 19 - steampunkscd.png">
-        <img loading="lazy" src="../img/art/2023/IMG_20240718_224121.jpg">
-        <img loading="lazy" src="../img/art/2023/June 4 scd.png">
-        <img loading="lazy" src="../img/art/2023/IMG_20240718_224255.jpg">
-        <img loading="lazy" src="../img/art/2023/IMG_20240718_224248.jpg">
-        <img loading="lazy" src="../img/art/2023/gregepicwip2.png">
-        <h4>2022</h4>
-	<img loading="lazy" src="../img/art/2022/guy.jpg">
-	<img loading="lazy" src="../img/art/2022/IMG_20240718_223643.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20241230_152950.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223943.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223809.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223752.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223745.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223733.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20230221_144951_edit_177165706492236.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20220226_183246.jpg">
-        <h4>2021</h4>
-        <img loading="lazy" src="../img/art/2021/IMG_20210721_115209.jpg">
->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
     </div>
 </body>
 </html>
-- 
cgit v1.3