Projects >> jsoup >>bc4a9ceacb2b36ad54f14ff7ca31fe9329158728

Chunk
Conflicting content 
        String url = "http://www.google.com"; // no trailing / to force redir
        Document doc = Jsoup.parse(new URL(url), 10*1000);
        assertTrue(doc.title().contains("Google"));
<<<<<<< HEAD
    } 

    @Test public void noop() {}
}
=======
    }

    @Test public void noop() {}
}
>>>>>>> 57eafb53f1354d114d2af329bbd51d064ca1d269
Solution content 
        String url = "http://www.google.com"; // no trailing / to force redir
        Document doc = Jsoup.parse(new URL(url), 10*1000);
        assertTrue(doc.title().contains("Google"));
    } 

    @Test public void noop() {}
}
File
UrlConnectTest.java
Developer's decision
Version 1
Kind of conflict
Method declaration