| Chunk |
|---|
| Conflicting content |
|---|
* (probably response to command).
*/
public void parseServiceList(String message) {
<<<<<<< HEAD
// We expect the service list to be in this format:
// *245 service-list window-manager core ecmascript-service
int split = message.indexOf(' ');
if (split < 0) {
connectionHandler.onException(
new IllegalStateException("Invalid service list received: " + message));
=======
List |
| Solution content |
|---|
* (probably response to command).
*/
public void parseServiceList(String message) {
// We expect the service list to be in this format:
// *245 service-list window-manager,core,ecmascript-service
List |
| File |
|---|
| StpConnection.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Variable |