Projects >> graylog2-server >>6af3291f8b7f602bf8e02bf582d53d920070c322

Chunk
Conflicting content 
public class Api {

<<<<<<< HEAD
	public static final String ERROR_MSG_IO = "Could not connect to graylog2-server. Please make sure that it is running and you configured the correct REST URI.";
	
=======
	@SuppressWarnings("unchecked")
>>>>>>> 63fd24714bc9e665b2a3d5f9e86c559702aab39d
	public static  T get(URL url, T t) throws IOException, APIException {
		try {
			HttpURLConnection conn = (HttpURLConnection) url.openConnection();
Solution content 
public class Api {

	public static final String ERROR_MSG_IO = "Could not connect to graylog2-server. Please make sure that it is running and you configured the correct REST URI.";

	@SuppressWarnings("unchecked")
	public static  T get(URL url, T t) throws IOException, APIException {
		try {
			HttpURLConnection conn = (HttpURLConnection) url.openConnection();
File
Api.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Attribute