Projects >> pmd >>2b72dcabf23a315e48200dd3c0ba635fcaf8fbd6

Chunk
Conflicting content 
    public static final Map> REPORT_FORMAT_TO_RENDERER;
    static {
<<<<<<< HEAD
	Map> map = new TreeMap<>();
=======
	Map> map = new TreeMap>();
	map.put(CodeClimateRenderer.NAME, CodeClimateRenderer.class);
>>>>>>> e08ba3ea30d6ab4d068f2840a84a5f8a97820ca0
	map.put(XMLRenderer.NAME, XMLRenderer.class);
	map.put(IDEAJRenderer.NAME, IDEAJRenderer.class);
	map.put(TextColorRenderer.NAME, TextColorRenderer.class);
Solution content 
    public static final Map> REPORT_FORMAT_TO_RENDERER;
    static {
	Map> map = new TreeMap<>();
	map.put(CodeClimateRenderer.NAME, CodeClimateRenderer.class);
	map.put(XMLRenderer.NAME, XMLRenderer.class);
	map.put(IDEAJRenderer.NAME, IDEAJRenderer.class);
	map.put(TextColorRenderer.NAME, TextColorRenderer.class);
File
RendererFactory.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable