From 7c70e24aa8680bb6b14d7e1fd224a091ea21b363 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Sun, 3 Dec 2023 20:31:46 -0400
Subject: css: fix bad merge, lol

---
 src/static/site6.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/static')

diff --git a/src/static/site6.css b/src/static/site6.css
index 56a0533..d2cda06 100644
--- a/src/static/site6.css
+++ b/src/static/site6.css
@@ -1003,7 +1003,6 @@ h1 a[href="#additional-names-box"]:hover {
   display: inline-block;
 }
 
->>>>>>> preview:src/static/site6.css
 /* Images */
 
 .image-container {
-- 
cgit 1.3.0-6-gf8a5