| Chunk |
|---|
| Conflicting content |
|---|
public class Version {
/** Returns the version UID.
*/
<<<<<<< HEAD
public static final String UID = "7.0.0";
=======
public static final String UID = "6.5.5";
>>>>>>> f4139eee6cdbeabefd6f98751a8a82254c77ad10
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "7.0.0";
} |
| 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 = "7.0.0";
=======
public static final String UID = "6.5.5";
>>>>>>> f4139eee6cdbeabefd6f98751a8a82254c77ad10
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "7.0.0";
} |
| 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 = "7.0.0";
=======
public static final String UID = "6.5.5";
>>>>>>> f4139eee6cdbeabefd6f98751a8a82254c77ad10
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "7.0.0";
} |
| File |
|---|
| Version.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |