GHI-#25 Use nord7 for incoming merge conflicts

nordtheme · Jul 1, 2017 · d380c08 · d380c08
1 parent bc02c97
commit d380c08
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/themes/nord.json b/themes/nord.json
@@ -94,8 +94,8 @@
     "list.highlightForeground": "#88c0d0",
     "merge.currentHeaderBackground": "#81a1c166",
     "merge.currentContentBackground": "#81a1c14d",
-    "merge.incomingHeaderBackground": "#5e81ac66",
-    "merge.incomingContentBackground": "#5e81ac4d",
+    "merge.incomingHeaderBackground": "#8fbcbb66",
+    "merge.incomingContentBackground": "#8fbcbb4d",
     "merge.border": "#3b425200",
     "notification.background": "#3b4252",
     "notification.foreground": "#d8dee9",