Projects >> Web-Karma >>72fce0faacff43d16c4f38560831af9adab2263c

Chunk
Conflicting content 
				new PublishRDFCellCommandFactory());
		commandFactoryMap.put(FetchPreferencesCommand.class.getSimpleName(),
				new FetchPreferencesCommandFactory());
<<<<<<< HEAD
		commandFactoryMap.put(ResetModelCommand.class.getSimpleName(),
				new ResetModelCommandFactory());
=======
		commandFactoryMap.put(GenerateCleaningRulesCommand.class.getSimpleName(),
				new GenerateCleaningRulesCommandFactory());
>>>>>>> 7d16f6672ab9cc322813aef52d55e23c49fbadf6
	}

	public VWorkspace getvWorkspace() {
Solution content 
				new PublishRDFCellCommandFactory());
		commandFactoryMap.put(FetchPreferencesCommand.class.getSimpleName(),
				new FetchPreferencesCommandFactory());
		commandFactoryMap.put(ResetModelCommand.class.getSimpleName(),
				new ResetModelCommandFactory());
		commandFactoryMap.put(GenerateCleaningRulesCommand.class.getSimpleName(),
				new GenerateCleaningRulesCommandFactory());
	}

	public VWorkspace getvWorkspace() {
File
ExecutionController.java
Developer's decision
Concatenation
Kind of conflict
Method invocation