Projects >> nuxeo-core >>7f376454adb07849451ae55a45b3c5984778ef0e

Chunk
Conflicting content 
    }
                checkedDocs.add(doc.getRef());
            }
            OperationEvent event = OperationEventFactory.createEvent(coreEvent);
<<<<<<< HEAD
            CoreEventPublisher.getInstance().publish(event, event.getId());
=======
            if(event != null) {
                CoreEventPublisher.getInstance().publish(event, event.id);
            }
>>>>>>> 202a444c4306d499ea7175dc36f6996eb038f7ba
        }
Solution content 
                checkedDocs.add(doc.getRef());
            }
            OperationEvent event = OperationEventFactory.createEvent(coreEvent);
            if(event != null) {
                CoreEventPublisher.getInstance().publish(event, event.getId());
            }
        }

    }
File
JMSEventListener.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation