Projects >> jbpm >>4bb227545b48c92c6156774c289cc65f3916cbaf

Chunk
Conflicting content 
	private static int clientCounter = 0;
    
	private TaskService service;
<<<<<<< HEAD
=======
	private TaskClient client;
	private Map> groupListMap = new HashMap>();
	
	public TaskManagement () {
	    super();
	}
>>>>>>> 554a545f80dcb49494555a7b7002fd98d225c26f

	private Map> groupListMap = new HashMap>();
Solution content 
	private static int clientCounter = 0;
    
	private TaskService service;
	private Map> groupListMap = new HashMap>();

	public TaskManagement () {
	    super();
	}
File
TaskManagement.java
Developer's decision
Combination
Kind of conflict
Attribute
Method declaration
Method invocation