Projects >> nuxeo-features >>31d60352dfda6e49e03aa60bccad56eeb193babb

Chunk
Conflicting content 
import java.util.List;
import java.util.Map;

<<<<<<< HEAD
=======
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.security.auth.Subject;
>>>>>>> c92715e52486926964cb3bdc2ec21b44bfeb8e5e
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
Solution content 
import java.util.List;
import java.util.Map;

import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
File
NuxeoAuthenticationFilter.java
Developer's decision
Combination
Kind of conflict
Import