Projects >> cmov1 >>5b1ceed3d92a2ce7d93251dc332d85c8074c0b92

Chunk
Conflicting content
public class RailsRestClient {
	
<<<<<<< HEAD
	public final static String SERVER_URL = "http://192.168.1.4:3000/";

	//public final static String SERVER_URL = "http://172.30.59.203:3000/";
=======
	public final static String SERVER_URL = "http://10.0.0.144:3000/";
	//public final static String SERVER_URL = "http://172.30.87.198:3000/";
>>>>>>> 6734277b89000e32552deceedb9f5335c6dca845

	public static JSONObject Get(String controller) {
		return HttpClient.SendHttpGet(SERVER_URL + controller + ".json");
Solution content
public class RailsRestClient {
	
	public final static String SERVER_URL = "http://192.168.1.4:3000/";


	public static JSONObject Get(String controller) {
		return HttpClient.SendHttpGet(SERVER_URL + controller + ".json");
File
RailsRestClient.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment