Projects >> nuxeo-features >>80f985ade35bf08af49a6e77e2e41a3d51be49bc

Chunk
Conflicting content 
    static final QName docMimetypeTag = DocumentFactory.getInstance().createQName(
            "mimetype");

<<<<<<< HEAD
=======
    static final QName docFileExtensionTag = DocumentFactory.getInstance().createQName(
            "fileExtension");

>>>>>>> d7b20e35c1e558e4cdfec2a38d7382293d38449b
    static final QName docIsVersionTag = DocumentFactory.getInstance().createQName(
            "isVersion");
Solution content 
    static final QName docMimetypeTag = DocumentFactory.getInstance().createQName(
            "mimetype");

    static final QName docFileExtensionTag = DocumentFactory.getInstance().createQName(
            "fileExtension");

    static final QName docIsVersionTag = DocumentFactory.getInstance().createQName(
            "isVersion");
File
LiveEditConstants.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation