| Chunk |
|---|
| Conflicting content |
|---|
public String computeOutcome(String actionOutcome) {
// actionOutcome is currently ignored on purpose but might be useful in
// the future
<<<<<<< HEAD
return null;
=======
FacesContext facesContextInstance = FacesContext.getCurrentInstance();
if (facesContextInstance == null)
return null;
String viewId = facesContextInstance.getViewRoot().getViewId();
return viewId.substring(1, viewId.indexOf(".xhtml"));
>>>>>>> db8bc1010ac09da115a180daf4364020180d1a9f
}
} |
| Solution content |
|---|
public String computeOutcome(String actionOutcome) {
// actionOutcome is currently ignored on purpose but might be useful in
// the future
return null;
}
} |
| File |
|---|
| InputController.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Return statement |
| Variable |