Projects >> android-arabic-reader >>bfa8855ce7e2ef808f2d4933d6bf1418d065cd99

Chunk
Conflicting content 
import android.graphics.Bitmap;
import android.os.Bundle;
import android.os.Environment;
<<<<<<< HEAD
import android.view.*;
import android.widget.*;
=======
import android.util.Log;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
>>>>>>> 32b5adce42d897439b9c80a72e6f47a157d0c230

import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.image.ZLImage;
Solution content 
import android.graphics.Bitmap;
import android.os.Bundle;
import android.os.Environment;
import android.view.*;
import android.widget.*;

import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.image.ZLImage;
File
FileManager.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.geometerplus.zlibrary.core.image.ZLImage;
import org.geometerplus.zlibrary.core.resources.ZLResource;

<<<<<<< HEAD
import org.geometerplus.zlibrary.ui.android.R;
=======
import org.geometerplus.fbreader.Paths;

import org.geometerplus.android.fbreader.FBReader;

>>>>>>> 32b5adce42d897439b9c80a72e6f47a157d0c230

import org.geometerplus.fbreader.Paths;
import org.geometerplus.fbreader.library.Book;
Solution content 
import org.geometerplus.zlibrary.core.image.ZLImage;
import org.geometerplus.zlibrary.core.resources.ZLResource;

import org.geometerplus.fbreader.Paths;
import org.geometerplus.fbreader.library.Book;
File
FileManager.java
Developer's decision
None
Kind of conflict
Import