Projects >> android-arabic-reader >>fa2e98961bc98dbd8e5537798cdc4455918f64be

Chunk
Conflicting content 
import org.geometerplus.zlibrary.ui.android.R;

<<<<<<< HEAD
import org.geometerplus.android.util.UIUtil;
=======
import org.geometerplus.android.util.AndroidUtil;
import org.geometerplus.android.fbreader.FBReader;
>>>>>>> 501ab4d7640ae698922d125f08d3e5298130629a

import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.tree.NetworkBookTree;
Solution content 
import org.geometerplus.zlibrary.ui.android.R;

import org.geometerplus.android.util.UIUtil;
import org.geometerplus.android.fbreader.FBReader;

import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.tree.NetworkBookTree;
File
NetworkBookActions.java
Developer's decision
Combination
Kind of conflict
Import