From 7406f1e5a677f024ec0cd966a3aa4f62f2908cf5 Mon Sep 17 00:00:00 2001 From: Kristi Date: Sun, 14 Aug 2022 03:48:24 -0400 Subject: [PATCH] Update git conflict color --- themes/tokyo-night-color-theme.json | 2 +- themes/tokyo-night-storm-color-theme.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/tokyo-night-color-theme.json b/themes/tokyo-night-color-theme.json index f30f295..32c2999 100644 --- a/themes/tokyo-night-color-theme.json +++ b/themes/tokyo-night-color-theme.json @@ -360,7 +360,7 @@ "gitDecoration.renamedResourceForeground": "#449dab", "gitDecoration.addedResourceForeground": "#449dab", "gitDecoration.untrackedResourceForeground": "#449dab", - "gitDecoration.conflictingResourceForeground": "#e0af68", + "gitDecoration.conflictingResourceForeground": "#e0af68cc", "gitDecoration.stageDeletedResourceForeground": "#914c54", "gitDecoration.stageModifiedResourceForeground": "#6183bb", diff --git a/themes/tokyo-night-storm-color-theme.json b/themes/tokyo-night-storm-color-theme.json index 040a4e4..4cbb2e0 100644 --- a/themes/tokyo-night-storm-color-theme.json +++ b/themes/tokyo-night-storm-color-theme.json @@ -359,7 +359,7 @@ "gitDecoration.renamedResourceForeground": "#449dab", "gitDecoration.addedResourceForeground": "#449dab", "gitDecoration.untrackedResourceForeground": "#449dab", - "gitDecoration.conflictingResourceForeground": "#e0af68", + "gitDecoration.conflictingResourceForeground": "#e0af68cc", "gitDecoration.stageDeletedResourceForeground": "#914c54", "gitDecoration.stageModifiedResourceForeground": "#6183bb",