Projects >> android-arabic-reader >>2819ebf35c3a37cecc69065327d072cca4b78bff

Chunk
Conflicting content 
import org.geometerplus.fbreader.book.Book;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.fbreader.options.ColorProfile;
<<<<<<< HEAD
import org.geometerplus.fbreader.network.opds.OPDSBookItem;
import org.geometerplus.fbreader.network.urlInfo.BookUrlInfo;
import org.geometerplus.fbreader.network.urlInfo.UrlInfo;

import org.geometerplus.android.util.UIUtil;
=======
>>>>>>> 5b46245782143e977b44f070accffd73be309478

class DisplayBookPopupAction extends FBAndroidAction {
	DisplayBookPopupAction(FBReader baseActivity, FBReaderApp fbreader) {
Solution content 
class DisplayBookPopupAction extends FBAndroidAction {
import org.geometerplus.fbreader.book.Book;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.fbreader.options.ColorProfile;
import org.geometerplus.fbreader.network.opds.OPDSBookItem;
import org.geometerplus.fbreader.network.urlInfo.BookUrlInfo;
import org.geometerplus.fbreader.network.urlInfo.UrlInfo;

import org.geometerplus.android.util.UIUtil;

	DisplayBookPopupAction(FBReader baseActivity, FBReaderApp fbreader) {
File
DisplayBookPopupAction.java
Developer's decision
Version 1
Kind of conflict
Import