Projects >> congress-android >>28540b414a11b38b7803ac1c7a3c00c0137be0cd

Chunk
Conflicting content 
	public void onLoadBills(CongressException exception) {
		if (bills != null && bills.size() > 0) {
			lw.getLoading().setVisibility(View.GONE);
<<<<<<< HEAD
			
			Button retry = lw.getRetry();
			retry.setVisibility(View.VISIBLE);
			retry.setOnClickListener(new View.OnClickListener() {
=======
			Button retry = lw.getRetry();
			retry.setVisibility(View.VISIBLE);
			retry.setOnClickListener(new View.OnClickListener() {
				@Override
>>>>>>> 01c541feb739823e4547794f742e0c85d98d0812
				public void onClick(View v) {
					loadBills();
				}
Solution content 
	public void onLoadBills(CongressException exception) {
		if (bills != null && bills.size() > 0) {
			lw.getLoading().setVisibility(View.GONE);

			Button retry = lw.getRetry();
			retry.setVisibility(View.VISIBLE);
			retry.setOnClickListener(new View.OnClickListener() {
				public void onClick(View v) {
					loadBills();
				}
File
BillList.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable