Remove merge marker

koddsson · koddsson · commit e4f62f1c9b44 · 2023-02-05T16:29:17.000+01:00
diff --git a/css/global.css b/css/global.css
@@ -354,7 +354,6 @@ page-search {
   margin-block: var(--size-5);
 }
 
-<<<<<<< HEAD
 .language-js .keyword {
   color: var(--orange-6);
 }
