| Chunk |
|---|
| Conflicting content |
|---|
public class Version {
/** The version UID used to identify the resources.
*/
<<<<<<< HEAD
public static final String UID = "6.0.3";
=======
public static final String UID = "6.0.2.1";
>>>>>>> 77fe0c7db77b6d5efac60c2732033094e8009ae9
} |
| Solution content |
|---|
public class Version {
/** The version UID used to identify the resources.
*/
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 {
/** The version UID used to identify the resources.
*/
<<<<<<< HEAD
public static final String UID = "6.0.3";
=======
public static final String UID = "6.0.2.1";
>>>>>>> 77fe0c7db77b6d5efac60c2732033094e8009ae9
} |
| Solution content |
|---|
public class Version {
/** The version UID used to identify the resources.
*/
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";
>>>>>>> 77fe0c7db77b6d5efac60c2732033094e8009ae9
} |
| 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 {
/** The version UID used to identify the resources.
*/
<<<<<<< HEAD
public static final String UID = "6.0.3";
=======
public static final String UID = "6.0.2.1";
>>>>>>> 77fe0c7db77b6d5efac60c2732033094e8009ae9
/** The release version. The official version.
* It is the same as {@link org.zkoss.zk.ui.WebApp#getVersion}.
* @since 3.0.0 |
| Solution content |
|---|
public class Version {
/** The version UID used to identify the resources.
*/
public static final String UID = "6.0.3";
/** The release version. The official version.
* It is the same as {@link org.zkoss.zk.ui.WebApp#getVersion}.
* @since 3.0.0 |
| File |
|---|
| Version.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
* It is the same as {@link org.zkoss.zk.ui.WebApp#getVersion}.
* @since 3.0.0
*/
<<<<<<< HEAD
public static final String RELEASE = "6.0.3-FL";
=======
public static final String RELEASE = "6.0.2.1";
>>>>>>> 77fe0c7db77b6d5efac60c2732033094e8009ae9
} |
| Solution content |
|---|
* It is the same as {@link org.zkoss.zk.ui.WebApp#getVersion}.
* @since 3.0.0
*/
public static final String RELEASE = "6.0.3-FL";
} |
| 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";
>>>>>>> 77fe0c7db77b6d5efac60c2732033094e8009ae9
} |
| 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";
>>>>>>> 77fe0c7db77b6d5efac60c2732033094e8009ae9
} |
| 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";
>>>>>>> 77fe0c7db77b6d5efac60c2732033094e8009ae9
} |
| 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";
>>>>>>> 77fe0c7db77b6d5efac60c2732033094e8009ae9
} |
| 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 |