Projects >> ledge >>e7df150b67a143b7470f69fdb866e8232c902e2e

Chunk
Conflicting content 
import org.jcontainer.dna.Configuration;
import org.jcontainer.dna.ConfigurationException;
import org.jcontainer.dna.Logger;
<<<<<<< HEAD
import org.objectledge.authentication.AuthenticationException;
import org.objectledge.authentication.UserManager;
=======
import org.objectledge.authentication.ServerApiRestrictions;
>>>>>>> 142a26d88892e6ccdb9c14f1f069493e886bec7d
import org.objectledge.context.Context;
import org.objectledge.pipeline.ProcessingException;
import org.objectledge.threads.Task;
Solution content 
import org.jcontainer.dna.Configuration;
import org.jcontainer.dna.ConfigurationException;
import org.jcontainer.dna.Logger;
import org.objectledge.authentication.AuthenticationException;
import org.objectledge.authentication.UserManager;
import org.objectledge.authentication.ServerApiRestrictions;
import org.objectledge.context.Context;
import org.objectledge.pipeline.ProcessingException;
import org.objectledge.threads.Task;
File
LocalSingleSignOnService.java
Developer's decision
Concatenation
Kind of conflict
Import