Projects >> jsoup >>5d77dbec8a182200d1d80d81bf1105ef900edd52

Chunk
Conflicting content
        assertEquals("Hello There", TextUtil.stripNewlines(doc.body().html()));
    }

<<<<<<< HEAD
    @Test public void testHeaderContents() {
        // h* tags (h1 .. h9) in browsers can handle any internal content other than other h*. which is not per any
        // spec, which defines them as containing phrasing content only. so, reality over theory.
        Document doc = Jsoup.parse("

Hello
There
now

More

Content

"); assertEquals("

Hello
There
now

More

Content

", TextUtil.stripNewlines(doc.body().html())); } @Test public void testSpanContents() { // like h1 tags, the spec says SPAN is phrasing only, but browsers and publisher treat span as a block tag Document doc = Jsoup.parse("Hello
there
now
"); assertEquals("Hello
there
now
", TextUtil.stripNewlines(doc.body().html())); ======= @Test public void testAllowsImageInNoScriptInHead() { // some sites use this pattern as an analytics mechanism Document doc = Jsoup.parse("

Hello

"); assertEquals("

Hello

", TextUtil.stripNewlines(doc.html())); >>>>>>> 6d4812111d19e33f22f7fac92c2203366a6fe5e0 } }
Solution content
        assertEquals("Hello There", TextUtil.stripNewlines(doc.body().html()));
    }

    @Test public void testHeaderContents() {
        // h* tags (h1 .. h9) in browsers can handle any internal content other than other h*. which is not per any
        // spec, which defines them as containing phrasing content only. so, reality over theory.
        Document doc = Jsoup.parse("

Hello
There
now

More

Content

"); assertEquals("

Hello
There
now

More

Content

", TextUtil.stripNewlines(doc.body().html())); } @Test public void testSpanContents() { // like h1 tags, the spec says SPAN is phrasing only, but browsers and publisher treat span as a block tag Document doc = Jsoup.parse("Hello
there
now
"); assertEquals("Hello
there
now
", TextUtil.stripNewlines(doc.body().html())); } @Test public void testAllowsImageInNoScriptInHead() { // some sites use this pattern as an analytics mechanism Document doc = Jsoup.parse("

Hello

"); assertEquals("

Hello

", TextUtil.stripNewlines(doc.html())); } }
File
ParserTest.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method declaration
Method invocation
Method signature
Variable