Projects >> tvticker >>b239b2f349924a3bdebba91ff30fae505798a0b7

Chunk
Conflicting content 
		return rowView;
	}

<<<<<<< HEAD
=======
	private void settimeMessage(Date show_time_start, Date show_time_end,ViewHolder holder) {
		String message = "";
		PrettyTime p = new PrettyTime(); //refer : http://ocpsoft.com/prettytime/#docs
		int style = 0;
		Date now = new Date();
		if (now.after(show_time_start) && now.before(show_time_end)) {
			message = p.format(show_time_end);
		} else if (now.before(show_time_start)) {
			message = p.format(show_time_start);
		} else if (now.after(show_time_start)) {
			message = "Finished";
		} else {
			message = "Unknown";
		}
		holder.show_timing.setText(message);
		holder.show_timing.setTypeface(null,style);
		
	}


>>>>>>> 0708d6ef0b0a0062fef3d9bf5dc48f81bbadc799
	private float sanitizeRatingValue(float floatValue) {
		return (floatValue * 3) / 10;
	}
Solution content 
		return rowView;
	}


	private float sanitizeRatingValue(float floatValue) {
		return (floatValue * 3) / 10;
	}
File
MyArrayAdapter.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
	}
	
	public class RPC {
<<<<<<< HEAD

		public final static String SERVICE_URI = "http://192.168.1.89:3000/service";
=======
		public final static String SERVICE_URI = "http://192.168.1.88:3000/service";
>>>>>>> 0708d6ef0b0a0062fef3d9bf5dc48f81bbadc799

		final static String API_KEY = "tvticker";
		final static String PROGRAM_TAG = "program";
Solution content 
	}
	
	public class RPC {


		public final static String SERVICE_URI = "http://192.168.1.89:3000/service";


		final static String API_KEY = "tvticker";
		final static String PROGRAM_TAG = "program";
File
Constants.java
Developer's decision
Version 1
Kind of conflict
Attribute