From 33700bc8615ad24ce0d6b9be31ce355065f92d17 Mon Sep 17 00:00:00 2001
From: Alexey Utkin <alexey.utkin@jetbrains.com>
Date: Thu, 1 Sep 2016 20:51:58 +0300
Subject: [PATCH] IDEA-158861 resolve merge conflicts #2

---
 .../src/com/intellij/codeInsight/daemon/UsedColors.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/UsedColors.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/UsedColors.java
index 19e8e77af381..a8a708d4c6b4 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/UsedColors.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/UsedColors.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-class UsedColors {
+public class UsedColors {
   private static final Key<Object/*UsedColor or UsedColor[]*/> USED_COLOR = Key.create("USED_COLOR");
 
   public static final AtomicInteger counter = new AtomicInteger();