Projects >> async-http-client >>4999b8dd4278f9cae0a1d278c00f067e8df5c12e

Chunk
Conflicting content 
import com.ning.http.client.providers.NettyAsyncHttpProvider;

import java.io.IOException;
<<<<<<< HEAD
import java.io.InputStream;
import java.util.List;
import java.util.Map;
=======
import java.util.concurrent.Executors;
>>>>>>> 31e901c2eec2cf1b5e63e53a010a0c5b762b13d5
import java.util.concurrent.Future;

/**
Solution content 
import com.ning.http.client.providers.NettyAsyncHttpProvider;

import java.io.IOException;
import java.util.concurrent.Future;

/**
File
AsyncHttpClient.java
Developer's decision
None
Kind of conflict
Import