Projects >> JDEECo >>a8a0ba3fb2364c4fc9605a5a31c9014f5be30cbc

Chunk
Conflicting content 
				+ "		String coordId,"
				+ "		" + wrapperClass + " coord%1$s,"
				+ "		" + paramHolderClass + " member%1$s) {"
<<<<<<< HEAD
//				+ " System.out.println(\"Knowledge injection \" + coordId + \" -> \" + memberId + \" %1$s \" + coord%1$s.getValue() + \" at \" +  coord%1$s.getTimestamp() + \" based on \" + \"%2$s\");"
=======
			//	+ " System.out.println(\"Knowledge injection \" + coordId + \" -> \" + memberId + \" %1$s \" + coord%1$s.getValue() + \" at \" +  coord%1$s.getTimestamp() + \" based on \" + \"%2$s\");"
>>>>>>> dcced6d81cd580b274e3c120610211e5c71668e2
				+ "	member%1$s.value = coord%1$s; "
				+ " ((" + wrapperClass + ") member%1$s.value).malfunction();}",
					correlationSubject, correlationFilter),
Solution content 
				+ "		String coordId,"
				+ "		" + wrapperClass + " coord%1$s,"
				+ "		" + paramHolderClass + " member%1$s) {"
//				+ " System.out.println(\"Knowledge injection \" + coordId + \" -> \" + memberId + \" %1$s \" + coord%1$s.getValue() + \" at \" +  coord%1$s.getTimestamp() + \" based on \" + \"%2$s\");"
				+ "	member%1$s.value = coord%1$s; "
				+ " ((" + wrapperClass + ") member%1$s.value).malfunction();}",
					correlationSubject, correlationFilter),
File
CorrelationEnsembleFactory.java
Developer's decision
Version 1
Kind of conflict
Comment