Projects >> emergency-service-drools-app >>2befb697d76a82cb97f495acfca68c7f559c840f

Chunk
Conflicting content
import com.wordpress.salaboy.workitemhandlers.MyReportingWorkItemHandler;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
<<<<<<< HEAD
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.QueryResults;
import org.drools.runtime.rule.WorkingMemoryEntryPoint;
import org.jbpm.process.workitem.wsht.CommandBasedWSHumanTaskHandler;
import org.drools.runtime.StatefulKnowledgeSession;
=======
import org.drools.FactHandle;
import org.drools.QueryResults;
import org.drools.WorkingMemoryEntryPoint;
import org.jbpm.process.workitem.wsht.CommandBasedWSHumanTaskHandler;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.QueryResults;
import org.drools.runtime.rule.WorkingMemoryEntryPoint;
>>>>>>> 4efe9b0b21e74ea40cd7c0022a77515960e16de1
import org.jbpm.workflow.instance.WorkflowProcessInstance;
import org.plugtree.training.model.Ambulance;
import org.plugtree.training.model.Call;
Solution content
import com.wordpress.salaboy.workitemhandlers.MyReportingWorkItemHandler;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.drools.FactHandle;
import org.drools.QueryResults;
import org.drools.WorkingMemoryEntryPoint;
import org.jbpm.process.workitem.wsht.CommandBasedWSHumanTaskHandler;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.QueryResults;
import org.drools.runtime.rule.WorkingMemoryEntryPoint;
import org.jbpm.workflow.instance.WorkflowProcessInstance;
import org.plugtree.training.model.Ambulance;
import org.plugtree.training.model.Call;
File
EmergencyService.java
Developer's decision
Version 2
Kind of conflict
Import