| Chunk |
|---|
| Conflicting content |
|---|
private static final long serialVersionUID = -6338380183606090792L;
public void execute(ExecutionContext ec) throws Exception {
<<<<<<< HEAD
log.debug("Ending process");
=======
log.info("PROCESS ENDS");
>>>>>>> b676d885228ccbf820ee5e4b302e5a90b2248945
try {
ProcessInstance pi = getProcessInstance(ec); |
| Solution content |
|---|
private static final long serialVersionUID = -6338380183606090792L;
public void execute(ExecutionContext ec) throws Exception {
log.debug("Ending process");
try {
ProcessInstance pi = getProcessInstance(ec); |
| File |
|---|
| ApprobationEndActionHandler.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |