Projects >> zanata-server >>2985ab92625bbd9a1daaee39b11bdab20c2280eb

Chunk
Conflicting content
public class WorkspaceUsersPresenter extends WidgetPresenter {

<<<<<<< HEAD
=======
	public static final Place PLACE = new Place("WorkspaceUsersPresenter");
	private final DispatchAsync dispatcher;
	private final WorkspaceContext workspaceContext;
		
>>>>>>> c9f797ebc6e9d630fe1f0746cf493b3ec724b286
	public interface Display extends WidgetDisplay{
		HasChildTreeNodes getTree();
		HasFilter getFilter();
Solution content
public class WorkspaceUsersPresenter extends WidgetPresenter {

	private final DispatchAsync dispatcher;
	private final WorkspaceContext workspaceContext;
		
	public interface Display extends WidgetDisplay{
		HasChildTreeNodes getTree();
		HasFilter getFilter();
File
WorkspaceUsersPresenter.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation