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

(limited to 'old/projects.html')

diff --git a/old/projects.html b/old/projects.html
index d93e658..9a42db0 100644
--- a/old/projects.html
+++ b/old/projects.html
@@ -63,11 +63,7 @@
 	    <li>Troysort (joke)</li>
     </ul>
 	
-<<<<<<< HEAD
     <img src="../img/objects/duckgrass.gif"></img>
-=======
-    <img src="../img/objects/duckgrass.gif"></img>
->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
 
 </body>
 </html>
-- 
cgit v1.3