From 36d2381cf6f83dbbd4377ac2d07ee92c210c15f6 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 13 Oct 2016 15:03:26 +0300
Subject: [PATCH] IDEA-162384 merge: update default color scheme

---
 platform/platform-resources/src/DefaultColorSchemesManager.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-resources/src/DefaultColorSchemesManager.xml b/platform/platform-resources/src/DefaultColorSchemesManager.xml
index 521e291dae00..a5029fc7d57c 100644
--- a/platform/platform-resources/src/DefaultColorSchemesManager.xml
+++ b/platform/platform-resources/src/DefaultColorSchemesManager.xml
@@ -364,7 +364,7 @@
       <option name="DIFF_CONFLICT">
         <value>
           <option name="FOREGROUND"/>
-          <option name="BACKGROUND" value="ffded8" deuteranopia="ffec8c" protanopia="ffec8c"/>
+          <option name="BACKGROUND" value="ffd5cc" deuteranopia="ffec8c" protanopia="ffec8c"/>
           <option name="EFFECT_COLOR"/>
           <option name="ERROR_STRIPE_COLOR" value="ffc8bd" deuteranopia="fad932" protanopia="fad932"/>
         </value>