Projects information

Chunk

Conflicting content
canceled = false; final URL u = new URL(url); final URLConnection conn = u.openConnection(); <<<<<<< HEAD ======= >>>>>>> 492554aa8881ea7d51ecff0530e96922fdd4cc4b conn.setConnectTimeout(timeout); conn.setReadTimeout(timeout); conn.setRequestProperty("User-Agent", userAgent);

Conflicting content

        canceled = false;
        final URL u = new URL(url);
        final URLConnection conn = u.openConnection();
<<<<<<< HEAD
=======

>>>>>>> 492554aa8881ea7d51ecff0530e96922fdd4cc4b
        conn.setConnectTimeout(timeout);
        conn.setReadTimeout(timeout);
        conn.setRequestProperty("User-Agent", userAgent);

Solution content
canceled = false; final URL u = new URL(url); final URLConnection conn = u.openConnection(); conn.setConnectTimeout(timeout); conn.setReadTimeout(timeout); conn.setRequestProperty("User-Agent", userAgent);

Solution content

        canceled = false;
        final URL u = new URL(url);
        final URLConnection conn = u.openConnection();

        conn.setConnectTimeout(timeout);
        conn.setReadTimeout(timeout);
        conn.setRequestProperty("User-Agent", userAgent);

File
FWHttpClient.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
final URL u = new URL(url); final HttpURLConnection conn = (HttpURLConnection) u.openConnection(); conn.setDoOutput(true); <<<<<<< HEAD ======= >>>>>>> 492554aa8881ea7d51ecff0530e96922fdd4cc4b conn.setConnectTimeout(timeout); conn.setReadTimeout(timeout); conn.setRequestProperty("User-Agent", userAgent);

Conflicting content

        final URL u = new URL(url);
        final HttpURLConnection conn = (HttpURLConnection) u.openConnection();
        conn.setDoOutput(true);
<<<<<<< HEAD
=======
        
>>>>>>> 492554aa8881ea7d51ecff0530e96922fdd4cc4b
        conn.setConnectTimeout(timeout);
        conn.setReadTimeout(timeout);
        conn.setRequestProperty("User-Agent", userAgent);

Solution content
final URL u = new URL(url); final HttpURLConnection conn = (HttpURLConnection) u.openConnection(); conn.setDoOutput(true); conn.setConnectTimeout(timeout); conn.setReadTimeout(timeout); conn.setRequestProperty("User-Agent", userAgent);

Solution content

        final URL u = new URL(url);
        final HttpURLConnection conn = (HttpURLConnection) u.openConnection();
        conn.setDoOutput(true);
        
        conn.setConnectTimeout(timeout);
        conn.setReadTimeout(timeout);
        conn.setRequestProperty("User-Agent", userAgent);

File
FWHttpClient.java

Developer's decision
Version 1

Kind of conflict
Blank

Projects >> frostwire-android >>e7ddb61b4c722a0fb2d4238bc56c745d202dc070