Projects >> bpmn2-modeler >>f7112d7c18977a02b07fb87e8cbe2329751f673e

Chunk
Conflicting content 
 */
package org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.bpsim.util;

<<<<<<< HEAD
import java.util.List;

=======
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.bpsim.*;
>>>>>>> 40469b11ae1fae8f8c9da31392beb5f8945d0949
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.bpsim.BPSimDataType;
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.bpsim.BetaDistributionType;
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.bpsim.BinomialDistributionType;
Solution content 
 */
package org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.bpsim.util;

import java.util.List;

import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.bpsim.BPSimDataType;
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.bpsim.BetaDistributionType;
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.bpsim.BinomialDistributionType;
File
BpsimSwitch.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.drools.MetaentryType;
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.drools.OnEntryScriptType;
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.drools.OnExitScriptType;
<<<<<<< HEAD
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.drools.ProcessAnalysisDataType;
import org.eclipse.emf.ecore.EClass;
=======
>>>>>>> 40469b11ae1fae8f8c9da31392beb5f8945d0949
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
Solution content 
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.drools.MetaentryType;
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.drools.OnEntryScriptType;
import org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.model.drools.OnExitScriptType;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
File
DroolsSwitch.java
Developer's decision
Combination
Kind of conflict
Import