🔀 Merge

rubjo · Jun 23, 2022 · fee9b3b · fee9b3b
1 parent 6eff660
commit fee9b3b
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Ultimate Dark Neo.sublime-theme b/Ultimate Dark Neo.sublime-theme
@@ -6,13 +6,8 @@
     {
         "black": "hsl(0, 0%, 0%)",
         "darkgray": "hsl(213, 7%, 23%)",
-<<<<<<< HEAD
         "gray": "hsl(221, 9%, 53%)",
         "blue": "hsl(210, 50%, 66%)",
-=======
-        "gray": "hsl(213, 9%, 53%)",
-        "blue": "hsl(213, 50%, 66%)",
->>>>>>> 3c1b0c181579808630504cc425d6c26c744ed12c
         "blue5": "hsl(175, 43%, 56%)",
         "green": "hsl(114, 27%, 68%)",
         "yellow": "hsl(42, 58%, 61%)",