i hate git

Moodzz1 · Feb 7, 2025 · ae29b3e · ae29b3e
1 parent 9f1c40f
commit ae29b3e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/Vendetta/darkeyecandy.json b/Vendetta/darkeyecandy.json
@@ -27,12 +27,8 @@
      "BG_BASE_PRIMARY": [ "#3B3A45" ],
      "BG_BASE_SECONDARY": [ "#33323C" ],
      "BG_BASE_TERTIARY": [ "#393843" ],
-<<<<<<< HEAD
-     "BG_MOD_SUBTLE": [ "#CFC7D83E" ],
-=======
      "BG_MOD_SUBTLE": [ "#C48A7A3E" ],
      "BG_SURFACE_OVERLAY_TMP": [ "#383743" ],      
->>>>>>> 54afe9a (fixes, use more colours from hanibee's eye candy)
      "CARD_PRIMARY_BG": [ "#3B3A45" ],
      "CARD_SECONDARY_BG": [ "#474453" ],
      "CHANNEL_ICON": [ "#BDBECC" ],

diff --git a/Vendetta/eyecandy.json b/Vendetta/eyecandy.json
@@ -27,12 +27,8 @@
      "BG_BASE_PRIMARY": [ "#4B4957" ],
      "BG_BASE_SECONDARY": [ "#3F3E4A" ],
      "BG_BASE_TERTIARY": [ "#484654" ],
-<<<<<<< HEAD
-     "BG_MOD_SUBTLE": [ "#CFC7D83E" ],
-=======
      "BG_MOD_SUBTLE": [ "#C48A7A3E" ],
      "BG_SURFACE_OVERLAY_TMP": [ "#474655" ],   
->>>>>>> 54afe9a (fixes, use more colours from hanibee's eye candy)
      "CARD_PRIMARY_BG": [ "#4B4957" ],
      "CARD_SECONDARY_BG": [ "#474453" ],
      "CHANNEL_ICON": [ "#BDBECC" ],