From f40e86feb751530ce2064014405be8004da32e1e Mon Sep 17 00:00:00 2001
From: Radiohotline <radiohotline@disroot.org>
Date: Wed, 13 May 2026 16:49:02 +0000
Subject: links and webring

---
 old/links.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'old')

diff --git a/old/links.html b/old/links.html
index ffe48cc..43e7534 100644
--- a/old/links.html
+++ b/old/links.html
@@ -166,11 +166,7 @@
     <br>
 
     <div style="text-align: center;">
-<<<<<<< HEAD
       <img src="../img/objects/ducks.gif" alt="3D GIF of a duck and her ducklings.">
-=======
-      <img src="../img/objects/ducks.gif" alt="3D GIF of a duck and her ducklings.">
->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
     </div>
       </div>
 
-- 
cgit v1.3