Projects >> nuxeo >>6794bd72792d391443fcdc3a7263812381ad9384

Chunk
Conflicting content 
        assertEquals("personInfo", field.getType().getName());
    }

<<<<<<< HEAD
    public void testFeature() {
        deployContrib("CoreTestExtensions.xml");
=======
    public void testFeature() throws Exception {
        deployContrib("org.nuxeo.ecm.core.schema.tests",
                "CoreTestExtensions.xml");
>>>>>>> aa09258121d9848f1254d07d161ee0bed33bb700
        DocumentType docType = typeMgr.getDocumentType("myDoc");

        assertNotNull(docType);
Solution content 
        assertEquals("personInfo", field.getType().getName());
    }

    public void testFeature() throws Exception {
        deployContrib("org.nuxeo.ecm.core.schema.tests",
                "CoreTestExtensions.xml");
        DocumentType docType = typeMgr.getDocumentType("myDoc");

        assertNotNull(docType);
File
TestSchemaLoader.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature