resolve conflicts

goshippo · Sep 13, 2024 · 3659ac7 · 3659ac7
2 parents 5f5d74f + 862f206
commit 3659ac7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/cm.css b/src/cm.css
@@ -6,7 +6,7 @@
 * {
   --primary-color: #000000;
   --text-color: #010101;
-  --shippo-solid-teal: #01474F;
+  --shippo-solid-teal: #01474F;  --shippo-solid-teal: #01474F;
   --neue-haas-name: 'neue-haas-unica';
   --neue-haas-bold: 600;
   --neue-haas-regular: 300;