MinaR
15f30b16e9
# Conflicts: # ems-contabil/.settings/org.eclipse.jdt.core.prefs # ems-core/src/main/java/it/integry/ems/sync/SyncManager.java # ems-engine/pom.xml # ems-engine/src/main/java/it/integry/ems/controller/EmsController.java # ems-model/src/main/java/it/integry/ems/base/EntityBase.java # ems-model/src/main/java/it/integry/ems/coollection/Coollection.java # ems-model/src/main/java/it/integry/ems/coollection/matcher/Matcher.java # ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Contains.java # ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Equals.java # ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/GreaterThan.java # ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/IsNull.java # ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/LessThan.java # ems-model/src/main/java/it/integry/ems/coollection/matcher/custom/Not.java # ems-model/src/main/java/it/integry/ems/coollection/query/Query.java # ems-model/src/main/java/it/integry/ems/coollection/query/criteria/Criteria.java # ems-model/src/main/java/it/integry/ems/coollection/query/criteria/CriteriaList.java # ems-model/src/main/java/it/integry/ems/coollection/query/order/Order.java # ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderComparator.java # ems-model/src/main/java/it/integry/ems/coollection/query/order/OrderCriteria.java # ems-model/src/main/java/it/integry/ems/coollection/query/specification/Specification.java # ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/AndSpecification.java # ems-model/src/main/java/it/integry/ems/coollection/query/specification/custom/OrSpecification.java # ems-model/src/main/java/it/integry/ems/coollection/reflection/Phanton.java