Projects >> ostrich >>0c623ce2059b58113433e9e73775a276cf556593

Chunk
Conflicting content 
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
<<<<<<< HEAD
=======
import com.google.common.reflect.AbstractInvocationHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.MessageFormatter;
>>>>>>> 6088fbf40fd7b6c2a15ad450c8333ad9232628d0

import java.util.Set;
import java.util.concurrent.Future;
Solution content 
import java.util.Set;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.MessageFormatter;

import java.util.concurrent.Future;
File
ServicePool.java
Developer's decision
Combination
Kind of conflict
Import