| Chunk |
|---|
| Conflicting content |
|---|
protected boolean isChildable() {
return false;
}
<<<<<<< HEAD
=======
public String getOuterAttrs() {
final StringBuffer sb = new StringBuffer(60).append(super.getOuterAttrs());
HTMLs.appendAttribute(sb, "z.label", XMLs.escapeXML(getLabel()));
if (isDisabled())
HTMLs.appendAttribute(sb, "z.disd", true);
return sb.toString();
}
>>>>>>> 9447791cbc4333df851562d9d250f321d2c1719a
} |
| Solution content |
|---|
protected boolean isChildable() {
return false;
}
} |
| File |
|---|
| Comboitem.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
pi = pi.substring(len2);
}
<<<<<<< HEAD
=======
//Notify the browser by calling back zk.ald(nm) if _zcb
String jsextra = null;
if (pi.startsWith("/_zcb/")) {
pi = pi.substring(5);
jsextra = "\nzk.ald('" + (pi.startsWith("/js")?pi.substring(3):pi) + "');";
}
>>>>>>> 9447791cbc4333df851562d9d250f321d2c1719a
final String ext = Servlets.getExtension(pi, false); //complete ext
final Filter[] filters = getFilters(ext,
Servlets.isIncluded(request) ? FILTER_INCLUDE: FILTER_REQUEST); |
| Solution content |
|---|
pi = pi.substring(len2); } final String ext = Servlets.getExtension(pi, false); //complete ext final Filter[] filters = getFilters(ext, Servlets.isIncluded(request) ? FILTER_INCLUDE: FILTER_REQUEST); |
| File |
|---|
| ClassWebResource.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Variable |