Remove merge leftover

CTFd · Jun 18, 2024 · 9c249e9 · 9c249e9
1 parent acdb5e6
commit 9c249e9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/assets/scss/includes/utils/_lolight.scss b/assets/scss/includes/utils/_lolight.scss
@@ -15,11 +15,7 @@
   color: #032f62;
 }
 .ll-pct {
-<<<<<<< HEAD
   /* operators, punctuation */
-=======
-  /* operators, punctation */
->>>>>>> dfc0d1cf2598410e2a8f8a26f552b265aa2aa8a1
   color: #24292f;
 }
 .ll-key {