| Chunk |
|---|
| Conflicting content |
|---|
public class Version {
/** The version UID used to identify the resources.
*/
<<<<<<< HEAD
public static final String UID = "5.0.0";
=======
public static final String UID = "3.6.0";
>>>>>>> eb9ca6f249d95c363a578ddd84cf9d1485be517f
} |
| Solution content |
|---|
public class Version {
/** The version UID used to identify the resources.
*/
public static final String UID = "5.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 = "5.0.0";
=======
public static final String UID = "3.6.0";
>>>>>>> eb9ca6f249d95c363a578ddd84cf9d1485be517f
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "5.0.0";
} |
| 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 = "5.0.0";
=======
public static final String UID = "3.6.0";
>>>>>>> eb9ca6f249d95c363a578ddd84cf9d1485be517f
/** 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 = "5.0.0";
/** 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 = "5.0.0-FL";
=======
public static final String RELEASE = "3.6.0-FL";
>>>>>>> eb9ca6f249d95c363a578ddd84cf9d1485be517f
} |
| Solution content |
|---|
* It is the same as {@link org.zkoss.zk.ui.WebApp#getVersion}.
* @since 3.0.0
*/
public static final String RELEASE = "5.0.0-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 = "5.0.0";
=======
public static final String UID = "3.6.0";
>>>>>>> eb9ca6f249d95c363a578ddd84cf9d1485be517f
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "5.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 = "5.0.0";
=======
public static final String UID = "3.6.0";
>>>>>>> eb9ca6f249d95c363a578ddd84cf9d1485be517f
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "5.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 = "5.0.0";
=======
public static final String UID = "3.6.0";
>>>>>>> eb9ca6f249d95c363a578ddd84cf9d1485be517f
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "5.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 = "5.0.0";
=======
public static final String UID = "3.6.0";
>>>>>>> eb9ca6f249d95c363a578ddd84cf9d1485be517f
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "5.0.0";
} |
| File |
|---|
| Version.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
} else {
throw new UiException("Wrong parent: "+parent);
super.setParent(parent);
}
<<<<<<< HEAD
=======
public void invalidate() {
final Listbox listbox = getListbox();
if ((listbox != null && listbox.inSelectMold()) || getParent() instanceof Listgroup) {
getParent().invalidate();
//if HTML select, the cell doesn't exists in client
super.invalidate();
}
}
>>>>>>> eb9ca6f249d95c363a578ddd84cf9d1485be517f
} |
| Solution content |
|---|
throw new UiException("Wrong parent: "+parent);
super.setParent(parent);
}
} |
| File |
|---|
| Listcell.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
public class Version {
/** Returns the version UID.
*/
<<<<<<< HEAD
public static final String UID = "5.0.0";
=======
public static final String UID = "3.6.0";
>>>>>>> eb9ca6f249d95c363a578ddd84cf9d1485be517f
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "5.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 = "5.0.0";
=======
public static final String UID = "3.6.0";
>>>>>>> eb9ca6f249d95c363a578ddd84cf9d1485be517f
} |
| Solution content |
|---|
public class Version {
/** Returns the version UID.
*/
public static final String UID = "5.0.0";
} |
| File |
|---|
| Version.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |