Projects >> android-arabic-reader >>b046aa6017a4c70084804e695630b4f4573149ea

Chunk
Conflicting content 
import java.io.File;
import java.util.List;

<<<<<<< HEAD
import android.annotation.TargetApi;
import android.os.Build;
=======
import android.text.Html;
import android.text.method.LinkMovementMethod;
>>>>>>> bcac779c04c3eec6a480d93a229dc718c8c3684e
import android.util.TypedValue;
import android.view.Gravity;
import android.view.View;
Solution content 
import java.io.File;
import java.util.List;

import android.annotation.TargetApi;
import android.os.Build;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.View;
File
DisplayBookPopupAction.java
Developer's decision
Concatenation
Kind of conflict
Import