Projects >> emf >>15ca7614fbfc4ed75f2f4c80bdd5721c7dd1a2cc

Chunk
Conflicting content 
	@Inject
	private IQualifiedNameProvider nameProvider; 
	
<<<<<<< HEAD
  @Inject
  private IReferableElementsUnloader.GenericUnloader unloader;
	
	private boolean fullyInitialized = false;
=======
	protected boolean fullyInitialized = false;
>>>>>>> bd2877894dc7763e19ec05596bdb6295033b3d5b
	
	@Override
	public EList getContents() {
Solution content 
	@Inject
	private IQualifiedNameProvider nameProvider; 
	
  @Inject
  private IReferableElementsUnloader.GenericUnloader unloader;
	
	protected boolean fullyInitialized = false;
	
	@Override
	public EList getContents() {
File
XcoreResource.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute