Projects >> nuxeo >>28d9fa303c08092e79a04f19e38d1905be4b0313

Chunk
Conflicting content 
     *
     * @return the next page
     */
<<<<<<< HEAD
=======
    @SuppressWarnings( { "NonBooleanMethodNameMayNotStartWithQuestion" })
>>>>>>> 03bc79d016347959906e08cbe07379ab664f9811
    String checkOut() throws ClientException;

    /**
Solution content 
     *
     * @return the next page
     */
    @SuppressWarnings( { "NonBooleanMethodNameMayNotStartWithQuestion" })
    String checkOut() throws ClientException;

    /**
File
VersionedActions.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
import java.util.List;
import java.io.Serializable;

<<<<<<< HEAD
import javax.ejb.PostActivate;
import javax.ejb.PrePassivate;
=======
import javax.faces.application.FacesMessage;
>>>>>>> 03bc79d016347959906e08cbe07379ab664f9811

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Solution content 
import java.util.List;

import javax.faces.application.FacesMessage;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
File
VersionedActionsBean.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.nuxeo.ecm.platform.ui.web.api.UserAction;
import org.nuxeo.ecm.webapp.helpers.EventManager;
import org.nuxeo.ecm.webapp.helpers.EventNames;
<<<<<<< HEAD
=======
import org.nuxeo.ecm.webapp.helpers.ResourcesAccessor;
>>>>>>> 03bc79d016347959906e08cbe07379ab664f9811

/**
 * Deals with versioning actions.
Solution content 
import org.nuxeo.ecm.platform.ui.web.api.UserAction;
import org.nuxeo.ecm.webapp.helpers.EventManager;
import org.nuxeo.ecm.webapp.helpers.EventNames;
import org.nuxeo.ecm.webapp.helpers.ResourcesAccessor;

/**
 * Deals with versioning actions.
File
VersionedActionsBean.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
@Name("versionedActions")
@Scope(CONVERSATION)
@Install(precedence = FRAMEWORK)
<<<<<<< HEAD
public class VersionedActionsBean extends InputController implements
        VersionedActions, Serializable {
=======
public class VersionedActionsBean implements VersionedActions {
>>>>>>> 03bc79d016347959906e08cbe07379ab664f9811

    private static final long serialVersionUID = -5994196072812025648L;
    private static final Log log = LogFactory.getLog(VersionedActionsBean.class);
Solution content 
@Name("versionedActions")
@Scope(CONVERSATION)
@Install(precedence = FRAMEWORK)
public class VersionedActionsBean implements VersionedActions {

    private static final Log log = LogFactory.getLog(VersionedActionsBean.class);
File
VersionedActionsBean.java
Developer's decision
Version 2
Kind of conflict
Class signature