Projects >> Monsterismus >>57d1f8b0af6da7ad529f6f5cf08e360399b2a0ab

Chunk
Conflicting content
    private static final int FILL_COLOR = 0xFFFF0000;
    private static final int BASE_WIDTH = 300;
    private static final int BASE_HEIGHT = 90;
<<<<<<< HEAD
    public static PImage image;
=======
    private static final String STATEMENT ="Statement";
>>>>>>> a89f60a50fb583257ea816bd41455f5396e22455

    public int getColor() {
        return FILL_COLOR;
Solution content
    private static final int FILL_COLOR = 0xFFFF0000;
    private static final int BASE_WIDTH = 300;
    private static final int BASE_HEIGHT = 90;
    public static PImage image;
    private static final String STATEMENT ="Statement";

    public int getColor() {
        return FILL_COLOR;
File
IfStatement.java
Developer's decision
Concatenation
Kind of conflict
Attribute