Projects >> platform_dalvik >>bfed0fea0b35621e7f3752b39a2448b24dbadfd7

Chunk
Conflicting content 
        method = "setNamespaceAware",
        args = {boolean.class}
    )
<<<<<<< HEAD
    public void test_setNamespaceAwareZ() {
=======
    public void test_setNamespaceAwareZ() throws Exception {
        MyHandler mh = new MyHandler();
>>>>>>> 8812fdd711c64cfa4d634fd10ad9f103731aa8e0

        spf.setNamespaceAware(true);
        InputStream is = getClass().getResourceAsStream("/simple_ns.xml");
Solution content 
        method = "setNamespaceAware",
        args = {boolean.class}
    )
    public void test_setNamespaceAwareZ() throws Exception {
        MyHandler mh = new MyHandler();

        spf.setNamespaceAware(true);
        InputStream is = getClass().getResourceAsStream("/simple_ns.xml");
File
SAXParserFactoryTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature
Variable