« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
diff options
context:
space:
mode:
-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 {