Projects >> mes >>f70013f60a824fb22a5dc3e04bbca83f92eabd09

Chunk
Conflicting content 
import com.qcadoo.mes.core.api.DataDefinitionService;
import com.qcadoo.mes.core.api.Entity;
<<<<<<< HEAD
=======
import com.qcadoo.mes.core.enums.RestrictionOperator;
import com.qcadoo.mes.core.model.DataDefinition;
import com.qcadoo.mes.core.search.Restrictions;
import com.qcadoo.mes.core.search.SearchCriteriaBuilder;
import com.qcadoo.mes.core.search.SearchResult;
>>>>>>> ddf94cf146797c2ecd78b7488bd8f7a850921aff
import com.qcadoo.mes.core.view.ViewValue;
import com.qcadoo.mes.core.view.elements.comboBox.EntityComboBoxValue;
import com.qcadoo.mes.model.DataDefinition;
Solution content 
import com.qcadoo.mes.api.DataDefinitionService;
import com.qcadoo.mes.api.Entity;
import com.qcadoo.mes.enums.RestrictionOperator;
import com.qcadoo.mes.model.DataDefinition;
File
ProductService.java
Developer's decision
Manual
Kind of conflict
Import