Projects >> android-async-http >>a35e7b0ada68f31ad2f91e4aa8f58a9949cfecc9

Chunk
Conflicting content 
package com.loopj.android.http;

<<<<<<< HEAD
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import org.apache.http.Header;
=======
import java.io.IOException;

>>>>>>> c8cfff99dbad5b8eefc37e646efa1cb1dbbe7e30
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
Solution content 
package com.loopj.android.http;

import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import org.apache.http.Header;
import java.io.IOException;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
File
AsyncHttpResponseHandler.java
Developer's decision
Concatenation
Kind of conflict
Import