Projects >> eurekastreams >>cdab9dac8bb25ae6ad7fd6b938563894eaa008b4

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

<<<<<<< HEAD
import org.apache.commons.logging.Log;
import org.eurekastreams.commons.actions.TaskHandlerExecutionStrategy;
=======
>>>>>>> 942f7b5c07ca154fa01fb36eb20fc2781b70c91c
import org.eurekastreams.commons.actions.context.DefaultPrincipal;
import org.eurekastreams.commons.actions.context.PrincipalActionContext;
import org.eurekastreams.commons.actions.context.TaskHandlerActionContext;
Solution content 
import java.util.Map;
import java.util.Set;

import org.eurekastreams.commons.actions.TaskHandlerExecutionStrategy;
import org.eurekastreams.commons.actions.context.DefaultPrincipal;
import org.eurekastreams.commons.actions.context.PrincipalActionContext;
import org.eurekastreams.commons.actions.context.TaskHandlerActionContext;
File
GroupCreator.java
Developer's decision
Combination
Kind of conflict
Import