| Chunk |
|---|
| Conflicting content |
|---|
public class Version {
/** Returns the version UID.
*/
<<<<<<< HEAD
public static final String UID = "6.0.3";
=======
public static final String UID = "6.0.2.1";
>>>>>>> df69f05d98da1105369d5c24cbf1bbd944cf16dd
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "6.0.3";
} |
| File |
|---|
| Version.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
public class Version {
/** Returns the version UID.
*/
<<<<<<< HEAD
public static final String UID = "6.0.3";
=======
public static final String UID = "6.0.2.1";
>>>>>>> df69f05d98da1105369d5c24cbf1bbd944cf16dd
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "6.0.3";
} |
| File |
|---|
| Version.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
public class Version {
/** Returns the version UID.
*/
<<<<<<< HEAD
public static final String UID = "6.0.3";
=======
public static final String UID = "6.0.2.1";
>>>>>>> df69f05d98da1105369d5c24cbf1bbd944cf16dd
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "6.0.3";
} |
| File |
|---|
| Version.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |