Projects >> android-arabic-reader >>509e3dedf895f2f0e566de46ad6075d7c0a08efc

Chunk
Conflicting content 
import org.geometerplus.fbreader.network.NetworkLibrary;
import org.geometerplus.fbreader.network.HtmlUtil;

<<<<<<< HEAD
import org.geometerplus.android.fbreader.*;
=======
import org.geometerplus.android.fbreader.FBReader;
>>>>>>> 2be210d0bb1064b284ec70a3ac118a99b61b79c6
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
import org.geometerplus.android.fbreader.preferences.EditBookInfoActivity;
Solution content 
import org.geometerplus.fbreader.network.NetworkLibrary;
import org.geometerplus.fbreader.network.HtmlUtil;

import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.android.fbreader.FBUtil;
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
import org.geometerplus.android.fbreader.preferences.EditBookInfoActivity;
File
BookInfoActivity.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import org.geometerplus.fbreader.network.tree.ManageCatalogsItemTree;
import org.geometerplus.fbreader.network.NetworkTree;
import org.geometerplus.fbreader.network.NetworkLibrary;
<<<<<<< HEAD
import org.geometerplus.android.fbreader.OrientationUtil;
=======
import org.geometerplus.zlibrary.ui.android.R;
>>>>>>> 2be210d0bb1064b284ec70a3ac118a99b61b79c6
import org.geometerplus.android.fbreader.network.CatalogManagerActivity;
import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
import org.geometerplus.android.util.OrientationUtil;
Solution content 
import org.geometerplus.fbreader.network.tree.ManageCatalogsItemTree;
import org.geometerplus.fbreader.network.NetworkTree;
import org.geometerplus.fbreader.network.NetworkLibrary;
import org.geometerplus.android.fbreader.network.CatalogManagerActivity;
import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
import org.geometerplus.android.util.OrientationUtil;
File
ManageCatalogsAction.java
Developer's decision
None
Kind of conflict
Import