Projects >> VAMDC-Portal >>24d66b356121f1df4abe09ec886982a6706ba1cd

Chunk
Conflicting content 
	}

		queryData.addForm(new UtilForm());
	}

<<<<<<< HEAD
	@Override
	public List getNodesResponse() {
		return preview.getNodes();
	}

	@Override
	public User getUser() {
		return auth.getUser();
	@Override
	public QueryLog getQueryLog(){
		return this.queryLog;
	}
	
	@Override
	public QueryData getQueryData(){
		return this.queryData;
=======
	public void addFormAsync(){
		queryData.addForm(new AsyncForm());
>>>>>>> 0b0dc7d7dd73efabcf1b0af666f7531da923f98e
	}
	
}
Solution content 
		queryData.addForm(new UtilForm());
	}

	@Override
	public List getNodesResponse() {
		return preview.getNodes();
	}

	@Override
	public User getUser() {
		return auth.getUser();
	}

	@Override
	public QueryLog getQueryLog(){
		return this.queryLog;
	}
	
	@Override
	public QueryData getQueryData(){
		return this.queryData;

	public void addFormAsync(){
		queryData.addForm(new AsyncForm());
	}
	
}
File
QueryController.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Attribute
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
	
	final static Integer Environment=7;

<<<<<<< HEAD
	public final static Integer SINGLE_LIMIT=10;//Forms above this number can occur more than once
	public final static Integer Process = 12;
	public final static Integer Util = 15;
	public final static Integer Branches = 18;
	public final static Integer Query = 19;
	public static final Integer Comments = 20;
	
	public static final Integer GuidedRequestType =21;
	public static final Integer GuidedSpeciesType =22;
	public static final Integer GuidedRoot = 23;
	public final static Integer GuidedRadiative = 24;
	public static final Integer GuidedStates = 25;
	
=======
	public final static Integer SINGLE_LIMIT=10;//Forms above this number can occur once
	final static Integer Process = 12;
	final static Integer Util = 15;
	final static Integer Branches = 18;
	final static Integer Query = 19;
	static final Integer Comments = 20;
	static final Integer Async = 21;
>>>>>>> 0b0dc7d7dd73efabcf1b0af666f7531da923f98e
	
	@Override
	public int compare(Form o1, Form o2) {
Solution content 
	
	final static Integer Environment=7;

	public final static Integer SINGLE_LIMIT=10;//Forms above this number can occur more than once
	public final static Integer Process = 12;
	public final static Integer Util = 15;
	public final static Integer Branches = 18;
	public final static Integer Query = 19;
	public static final Integer Comments = 20;
	
	public static final Integer GuidedRequestType =22;
	public static final Integer GuidedSpeciesType =23;
	public static final Integer GuidedRoot = 24;
	public final static Integer GuidedRadiative = 25;
	public static final Integer GuidedStates = 26;
	
	static final Integer Async = 21;
	
	@Override
	public int compare(Form o1, Form o2) {
File
Order.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment