Projects >> umlg >>7e49af51fd3537ed0f9184da90c180bcaeec0776

Chunk
Conflicting content 
		result.add(new ToFromJsonCreator(Workspace.INSTANCE));
		result.add(new TofromJsonForEnumCreator(Workspace.INSTANCE));
		result.add(new LookupGenerator(Workspace.INSTANCE));
<<<<<<< HEAD
		result.add(new ClassInterfacePropertyLookupGenerator(Workspace.INSTANCE));
=======
>>>>>>> 953d047099e607a112abaaf6120cc6da8def3c35
		return result;
		
//		if (this.audit) {
Solution content 
		result.add(new ToFromJsonCreator(Workspace.INSTANCE));
		result.add(new TofromJsonForEnumCreator(Workspace.INSTANCE));
		result.add(new LookupGenerator(Workspace.INSTANCE));
<<<<<<< HEAD
		result.add(new ClassInterfacePropertyLookupGenerator(Workspace.INSTANCE));
=======
>>>>>>> 953d047099e607a112abaaf6120cc6da8def3c35
		return result;
		
//		if (this.audit) {
File
DefaultVisitors.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
package org.tuml.runtime.collection;


<<<<<<< HEAD
public interface TinkerQualifiedBag extends Multiset, TinkerBag {
=======
public interface TinkerQualifiedBag extends TinkerBag {
>>>>>>> 953d047099e607a112abaaf6120cc6da8def3c35
}
Solution content 
package org.tuml.runtime.collection;

import com.google.common.collect.Multiset;

public interface TinkerQualifiedBag extends Multiset, TinkerBag {
}
File
TinkerQualifiedBag.java
Developer's decision
Manual
Kind of conflict
Interface signature