| Chunk |
|---|
| Conflicting content |
|---|
/**
* activates this task by sending it to the executor
*/
<<<<<<< HEAD
public final void fire() {
if (executor==null) {
run();
} else {
executor.execute(this);
}
=======
protected final void fire() {
executor.execute(this);
>>>>>>> 9c391d947682c83967ab91f21457c7d2dda58339
}
} |
| Solution content |
|---|
/**
* activates this task by sending it to the executor
*/
public final void fire() {
executor.execute(this);
}
} |
| File |
|---|
| Task.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Method signature |