Projects >> mes >>f8c4441a8d83f592dced1f1f7f3bb6dd1ade6073

Chunk
Conflicting content 
                fieldValidationFactory.requiredOnCreate());
        DataFieldDefinition fieldBase = createFieldDefinition("base", fieldTypeFactory.booleanType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).readOnly();
<<<<<<< HEAD
=======
        DataFieldDefinition fieldCodeId = createFieldDefinition("codeId", fieldTypeFactory.stringType()).readOnly();
        DataFieldDefinition fieldPackageName = createFieldDefinition("packageName", fieldTypeFactory.stringType()).readOnly();
>>>>>>> 127fb3e8f8eff3bcec5b1cd2b35dc9e74950565e

        dataDefinition.setFullyQualifiedClassName("com.qcadoo.mes.plugins.beans.plugins.Plugin");
        dataDefinition.addField(fieldName);
Solution content 
                fieldValidationFactory.requiredOnCreate());
        DataFieldDefinition fieldBase = createFieldDefinition("base", fieldTypeFactory.booleanType()).withValidator(
                fieldValidationFactory.requiredOnCreate()).readOnly();
        DataFieldDefinition fieldCodeId = createFieldDefinition("codeId", fieldTypeFactory.stringType()).readOnly();
        DataFieldDefinition fieldPackageName = createFieldDefinition("packageName", fieldTypeFactory.stringType()).readOnly();

        dataDefinition.setFullyQualifiedClassName("com.qcadoo.mes.plugins.beans.plugins.Plugin");
        dataDefinition.addField(fieldName);
File
DataDefinitionServiceImpl.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable