mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IDEA-158861 resolve merge conflicts #2
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user