« get me outta code hell

css: fix bad merge, lol - hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
path: root/src/static
diff options
context:
space:
mode:
author(quasar) nebula <qznebula@protonmail.com>2023-12-03 20:31:46 -0400
committer(quasar) nebula <qznebula@protonmail.com>2023-12-03 20:31:46 -0400
commit7c70e24aa8680bb6b14d7e1fd224a091ea21b363 (patch)
treec90ad788c2a94ab839c9802f0b9bb5e3fd964ff4 /src/static
parent9d5f97b2dc5fa7990b7cfc7b8f4aa129981505a5 (diff)
css: fix bad merge, lol
Diffstat (limited to 'src/static')
-rw-r--r--src/static/site6.css1
1 files changed, 0 insertions, 1 deletions
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 {