Projects >> BF3-Battlelog >>b44975acd4b0f9fa3b6d0b140acbada09c836c18

Chunk
Conflicting content 
            // Init the HTTP-related attributes
            HttpGet httpGet = new HttpGet(link.replace(" ", "%20"));
<<<<<<< HEAD
            httpGet.setHeaders(HttpHeaders.GET_HEADERS.get(extraHeaders - 1));
            httpGet.setHeader("Referer", link);
=======

                httpGet.setHeaders(HttpHeaders.GET_HEADERS.get(extraHeaders));
                httpGet.setHeader("Referer", link);
>>>>>>> 1d7493d3ad65d405e56f2ef7504219bd5df3ac07

            HttpResponse httpResponse = RequestHandler.httpClient
                    .execute(httpGet);
Solution content 
            // Init the HTTP-related attributes
            HttpGet httpGet = new HttpGet(link.replace(" ", "%20"));
            httpGet.setHeaders(HttpHeaders.GET_HEADERS.get(extraHeaders));
            httpGet.setHeader("Referer", link);
                
            HttpResponse httpResponse = RequestHandler.httpClient
                    .execute(httpGet);
File
RequestHandler.java
Developer's decision
Version 2
Kind of conflict
Method invocation