Projects >> Ektorp >>95fdd42218e668da014b5e0c10957b136246ec8a

Chunk
Conflicting content 
package org.ektorp.android.http;

<<<<<<< HEAD
=======
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.KeyStore;
import java.util.Map;

import org.apache.http.HttpEntity;
>>>>>>> 1c01c1911995e52cb8f4c38ea91979bd4faac659
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
Solution content 
package org.ektorp.android.http;

import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
File
AndroidHttpClient.java
Developer's decision
Combination
Kind of conflict
Import