IDEA-158861 resolve merge conflicts #2

This commit is contained in:
Alexey Utkin
2016-09-01 20:51:58 +03:00
parent 98e1f6f998
commit 33700bc861
@@ -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();