| Chunk |
|---|
| Conflicting content |
|---|
import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; <<<<<<< HEAD ======= import org.apache.myfaces.trinidad.model.UploadedFile; >>>>>>> b237a92e0095afe002176d1ca00e4d9d8fec4c2e import org.nuxeo.ecm.core.api.Blob; import org.nuxeo.ecm.core.api.impl.blob.StreamingBlob; import org.nuxeo.ecm.platform.mimetype.MimetypeDetectionException; |
| Solution content |
|---|
import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuxeo.ecm.core.api.Blob; import org.nuxeo.ecm.core.api.impl.blob.StreamingBlob; import org.nuxeo.ecm.platform.mimetype.MimetypeDetectionException; |
| File |
|---|
| FileUtils.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.nuxeo.ecm.core.api.ClientException; package org.nuxeo.ecm.webapp.filemanager; import javax.ejb.Local; <<<<<<< HEAD import org.jboss.seam.annotations.remoting.WebRemote; ======= import org.jboss.seam.annotations.WebRemote; >>>>>>> b237a92e0095afe002176d1ca00e4d9d8fec4c2e /** |
| Solution content |
|---|
package org.nuxeo.ecm.webapp.filemanager; import javax.ejb.Local; import org.jboss.seam.annotations.remoting.WebRemote; import org.nuxeo.ecm.core.api.ClientException; /** |
| File |
|---|
| FileManageActionsLocal.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |