| Chunk |
|---|
| Conflicting content |
|---|
public static final String CAN_NOT_DELETE_EPHEMERAL_NODE = "can-not-delete-ephemeral-node";
<<<<<<< HEAD
public static final String BUDDYCLOUD_XMLNS_PREFIX = "bc:";
=======
public static final String POLICY_VIOLATION = "policy-violation";
public static final String INVALID_NODE = "invalid-node";
>>>>>>> d0f7ff165853408e6cf9cafa61d64581d7020e17
// Private (hidden) constructor
private XMLConstants() {
|
| Solution content |
|---|
public static final String CAN_NOT_DELETE_EPHEMERAL_NODE = "can-not-delete-ephemeral-node";
public static final String BUDDYCLOUD_XMLNS_PREFIX = "bc:";
public static final String POLICY_VIOLATION = "policy-violation";
public static final String INVALID_NODE = "invalid-node";
// Private (hidden) constructor
private XMLConstants() {
|
| File |
|---|
| XMLConstants.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Attribute |