Projects >> core >>cd07640d306dc03f1886b09442e57f8ba5cc0e4c

Chunk
Conflicting content 
package com.dotcms.rest.config;

import com.dotcms.repackage.org.glassfish.jersey.media.multipart.MultiPartFeature;
<<<<<<< HEAD
import com.dotcms.rest.RulesEnginePortlet;
import com.dotcms.rest.api.v1.sites.ruleengine.ConditionValuesResource;
import com.dotcms.rest.api.v1.sites.ruleengine.ConditionsResource;
import com.dotcms.rest.api.v1.sites.ruleengine.ActionsResource;
import com.dotcms.rest.api.v1.sites.rules.ConditionGroupsResource;
import com.dotcms.rest.api.v1.sites.rules.RulesResource;
=======
import com.dotcms.rest.api.v1.sites.ruleengine.ConditionValueResource;
import com.dotcms.rest.api.v1.sites.ruleengine.ConditionResource;
import com.dotcms.rest.api.v1.sites.ruleengine.ActionResource;
import com.dotcms.rest.api.v1.sites.rules.ConditionGroupResource;
import com.dotcms.rest.api.v1.sites.rules.RuleResource;
>>>>>>> 31a3f7b78d2b370ad228ea1ab392918f34510185
import com.dotcms.rest.api.v1.system.ActionletsResource;
import com.dotcms.rest.api.v1.system.ConditionletsResource;
Solution content 
package com.dotcms.rest.config;

import com.dotcms.repackage.org.glassfish.jersey.media.multipart.MultiPartFeature;
import com.dotcms.rest.RulesEnginePortlet;
import com.dotcms.rest.api.v1.sites.ruleengine.ConditionValueResource;
import com.dotcms.rest.api.v1.sites.ruleengine.ConditionResource;
import com.dotcms.rest.api.v1.sites.ruleengine.ActionResource;
import com.dotcms.rest.api.v1.sites.rules.ConditionGroupResource;
import com.dotcms.rest.api.v1.sites.rules.RuleResource;
import com.dotcms.rest.api.v1.system.ActionletsResource;
import com.dotcms.rest.api.v1.system.ConditionletsResource;
File
DotRestApplication.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
                    REST_CLASSES.add(com.dotcms.rest.RestExamplePortlet.class);
					REST_CLASSES.add(com.dotcms.rest.elasticsearch.ESContentResourcePortlet.class);
<<<<<<< HEAD
					REST_CLASSES.add(RulesEnginePortlet.class);

					REST_CLASSES.add(RulesResource.class);
					REST_CLASSES.add(ConditionGroupsResource.class);
					REST_CLASSES.add(ConditionsResource.class);
					REST_CLASSES.add(ConditionValuesResource.class);
=======
					REST_CLASSES.add(RuleResource.class);
					REST_CLASSES.add(ConditionGroupResource.class);
					REST_CLASSES.add(ConditionResource.class);
					REST_CLASSES.add(ConditionValueResource.class);
>>>>>>> 31a3f7b78d2b370ad228ea1ab392918f34510185
					REST_CLASSES.add(ConditionletsResource.class);
					REST_CLASSES.add(ActionResource.class);
					REST_CLASSES.add(ActionletsResource.class);
Solution content 
                    REST_CLASSES.add(com.dotcms.rest.RestExamplePortlet.class);
					REST_CLASSES.add(com.dotcms.rest.elasticsearch.ESContentResourcePortlet.class);
					REST_CLASSES.add(RulesEnginePortlet.class);

					REST_CLASSES.add(RuleResource.class);
					REST_CLASSES.add(ConditionGroupResource.class);
					REST_CLASSES.add(ConditionResource.class);
					REST_CLASSES.add(ConditionValueResource.class);
					REST_CLASSES.add(ConditionletsResource.class);
					REST_CLASSES.add(ActionResource.class);
					REST_CLASSES.add(ActionletsResource.class);
File
DotRestApplication.java
Developer's decision
Combination
Kind of conflict
Method invocation