Projects >> nuxeo-core >>12d281dff0a5f6f41e05cf8772d7b28fdee936d0

Chunk
Conflicting content 
                addTypeCollectionFragment(typeName, fragmentName);
            inferTypePropertyInfos(typeName, documentType.getSchemaNames());
            inferTypePropertyPaths(documentType);

<<<<<<< HEAD
            for (String fragmentName : getCommonSimpleFragments(typeName)) {
                addTypeSimpleFragment(typeName, fragmentName);
=======
            for (String fragmentName : getCommonSimpleFragments()) {
                addTypeFragment(typeName, fragmentName);
>>>>>>> aaaa4fdd5320c43e4e671c4755f283d620bd3806
            }
            for (String fragmentName : COMMON_COLLECTION_FRAGMENTS) {
Solution content 
            inferTypePropertyInfos(typeName, documentType.getSchemaNames());
            inferTypePropertyPaths(documentType);

            for (String fragmentName : getCommonSimpleFragments(typeName)) {
                addTypeFragment(typeName, fragmentName);
            }
            for (String fragmentName : COMMON_COLLECTION_FRAGMENTS) {
                addTypeCollectionFragment(typeName, fragmentName);
File
Model.java
Developer's decision
Combination
Kind of conflict
For statement
Method invocation