| Chunk |
|---|
| Conflicting content |
|---|
package com.enonic.xp.core.impl.content.page.region; import com.enonic.xp.app.ApplicationKey; <<<<<<< HEAD import com.enonic.xp.form.Form; ======= import com.enonic.xp.app.ApplicationService; >>>>>>> 880a5e1ef4357a42b7013cc91ea5867c98c90b15 import com.enonic.xp.form.InlineMixinsToFormItemsTransformer; import com.enonic.xp.module.Module; import com.enonic.xp.module.Modules; |
| Solution content |
|---|
package com.enonic.xp.core.impl.content.page.region; import com.enonic.xp.app.ApplicationKey; import com.enonic.xp.form.Form; import com.enonic.xp.app.ApplicationService; import com.enonic.xp.form.InlineMixinsToFormItemsTransformer; import com.enonic.xp.module.Module; import com.enonic.xp.module.Modules; |
| File |
|---|
| AbstractGetPartDescriptorCommand.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
{
private final static String PATH = "/app/parts";
<<<<<<< HEAD
protected ModuleService moduleService;
=======
private final static Pattern PATTERN = Pattern.compile( PATH + "/([^/]+)/\\1.xml" );
protected ApplicationService applicationService;
>>>>>>> 880a5e1ef4357a42b7013cc91ea5867c98c90b15
protected ResourceService resourceService;
|
| Solution content |
|---|
{
private final static String PATH = "/app/parts";
protected ApplicationService applicationService;
protected ResourceService resourceService;
|
| File |
|---|
| AbstractGetPartDescriptorCommand.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |