| Chunk |
|---|
| Conflicting content |
|---|
public static final Version v0_90_0 = new Version(0, 90, 0);
public static final Version v0_90_1 = new Version(0, 90, 1);
public static final Version v0_90_2 = new Version(0, 90, 2);
<<<<<<< HEAD
public static final Version v0_91_0 = new Version(0, 91, 0);
public static final Version v0_91_1 = new Version(0, 91, 1);
public static final Version v0_91_2 = new Version(0, 91, 2);
public static final Version VERSION = v0_91_2;
=======
public static final Version VERSION = v0_90_2;
>>>>>>> ca843dd32c55bd764ad5f050361e62f5ef7f5d05
public final int major;
public final int minor; |
| Solution content |
|---|
public static final Version v0_90_0 = new Version(0, 90, 0);
public static final Version v0_90_1 = new Version(0, 90, 1);
public static final Version v0_90_2 = new Version(0, 90, 2);
public static final Version v0_91_0 = new Version(0, 91, 0);
public static final Version v0_91_1 = new Version(0, 91, 1);
public static final Version v0_91_2 = new Version(0, 91, 2);
public static final Version VERSION = v0_91_2;
public final int major;
public final int minor; |
| File |
|---|
| Version.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |