Projects >> nuxeo-features >>e866d157d58911cea08ca1f252b49983fa244506

Chunk
Conflicting content 
import javax.security.auth.login.LoginContext;

import org.nuxeo.ecm.core.api.DocumentModel;
<<<<<<< HEAD
=======
import org.nuxeo.ecm.platform.ec.notification.NotificationConstants;
import org.nuxeo.ecm.platform.ec.notification.email.templates.NuxeoTemplatesLoader;
>>>>>>> 695c6ba4b61820a6106447b111a95b3b64535c87
import org.nuxeo.ecm.platform.ec.notification.service.NotificationService;
import org.nuxeo.ecm.platform.ec.notification.service.NotificationServiceHelper;
import org.nuxeo.ecm.platform.rendering.RenderingResult;
Solution content 
import javax.security.auth.login.LoginContext;

import org.nuxeo.ecm.core.api.DocumentModel;
import org.nuxeo.ecm.platform.ec.notification.NotificationConstants;
import org.nuxeo.ecm.platform.ec.notification.service.NotificationService;
import org.nuxeo.ecm.platform.ec.notification.service.NotificationServiceHelper;
import org.nuxeo.ecm.platform.rendering.RenderingResult;
File
EmailHelper.java
Developer's decision
Combination
Kind of conflict
Import