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/art.html | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'old/art.html')

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>
-- 
cgit v1.3