Projects >> bpmn2-modeler >>8bba2c646f5dd4b2c9f2bece207ceb568b86774c

Chunk
Conflicting content 
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain.Lifecycle;
import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
<<<<<<< HEAD
=======
import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
>>>>>>> 62bbb2a355378f0b66d39fdf700e05707005a0f8
import org.eclipse.graphiti.features.IFeatureProvider;
import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
import org.eclipse.graphiti.mm.pictograms.Diagram;
Solution content 
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain.Lifecycle;
import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
import org.eclipse.graphiti.features.IFeatureProvider;
import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
import org.eclipse.graphiti.mm.pictograms.Diagram;
File
BPMN2Editor.java
Developer's decision
Version 1
Kind of conflict
Import