Projects >> crash >>a31cb36631f5f0e59dbeada57c17ae937c3ea2e5

Chunk
Conflicting content 
 * @author Julien Viet
 * @version $Revision$
 */
<<<<<<< HEAD
public class JCRPlugin extends CRaSHPlugin {

   /** . */
   private static final Object LOCK = new Object();
=======
public abstract class JCRPlugin extends CRaSHPlugin implements Service {
>>>>>>> 976481969ba01ed6648dee6ca0d3e0aa8aa76fce

  private static final Collection NODES = Arrays.asList(
      "org.exoplatform.services.jcr.impl.core.NodeImpl",
Solution content 
 * @author Julien Viet
 * @version $Revision$
 */
public abstract class JCRPlugin extends CRaSHPlugin {

  /** . */
  private static final Collection NODES = Arrays.asList(
      "org.exoplatform.services.jcr.impl.core.NodeImpl",
File
JCRPlugin.java
Developer's decision
Manual
Kind of conflict
Attribute
Class signature
Comment
Method invocation