Projects >> nokogiri >>b6a34d936fa29aa26f1b4ea39c5ac73367744f0e

Chunk
Conflicting content 
                    } else {
                        nsUri = attr.lookupNamespaceURI(attrPrefix);
                    }
<<<<<<< HEAD
                    if (nsUri == e.getNamespaceURI()) {
                        nsUri = null;
                    }
                    if (!(nsUri == null || "".equals(nsUri))) {
=======
                    if (!(nsUri == null || "".equals(nsUri) || "http://www.w3.org/XML/1998/namespace".equals(nsUri))) {
>>>>>>> a7f07291ee3f5556457806bc3470146f4006e46e
                        XmlNamespace.createFromAttr(context.getRuntime(), attr);
                    }
                    clearCachedNode(attr);
Solution content 
                    } else {
                        nsUri = attr.lookupNamespaceURI(attrPrefix);
                    }

                    if (nsUri == e.getNamespaceURI()) {
                        nsUri = null;
                    }

                    if (!(nsUri == null || "".equals(nsUri) || "http://www.w3.org/XML/1998/namespace".equals(nsUri))) {
                        XmlNamespace.createFromAttr(context.getRuntime(), attr);
                    }
                    clearCachedNode(attr);
File
XmlNode.java
Developer's decision
Combination
Kind of conflict
If statement