From afdeb3339fc1c74e9af404f9eac82e3f9cf7b545 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 14 Dec 2016 19:51:04 +0300
Subject: [PATCH] Run Make without error check before "Generate Tests"

This is needed to simplify merge conflict resolution in case when only
generated tests have conflicts
---
 .idea/runConfigurations/Generate_Tests.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.idea/runConfigurations/Generate_Tests.xml b/.idea/runConfigurations/Generate_Tests.xml
index 38f81e01358..583432249e4 100644
--- a/.idea/runConfigurations/Generate_Tests.xml
+++ b/.idea/runConfigurations/Generate_Tests.xml
@@ -26,6 +26,9 @@
     <RunnerSettings RunnerId="Run" />
     <ConfigurationWrapper RunnerId="Debug" />
     <ConfigurationWrapper RunnerId="Run" />
-    <method />
+    <method>
+      <option name="Make" enabled="false" />
+      <option name="MakeNoErrorCheck" enabled="true" />
+    </method>
   </configuration>
 </component>
\ No newline at end of file