Projects >> android-arabic-reader >>b0edbfe74034e4fa57841ce170f93b3a0bd1bfa2

Chunk
Conflicting content 
import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager;

import org.geometerplus.fbreader.book.*;
<<<<<<< HEAD
=======
import org.geometerplus.fbreader.library.*;
>>>>>>> fbec1dc704f166c057e754bb4a651654abeb9f40
import org.geometerplus.fbreader.network.HtmlUtil;

import org.geometerplus.android.fbreader.*;
Solution content 
import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager;

import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.network.HtmlUtil;

import org.geometerplus.android.fbreader.*;
File
BookInfoActivity.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition;

import org.geometerplus.fbreader.book.*;
<<<<<<< HEAD:src/org/geometerplus/android/fbreader/libraryService/SQLiteBooksDatabase.java
=======
import org.geometerplus.fbreader.library.*;
>>>>>>> fbec1dc704f166c057e754bb4a651654abeb9f40:src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java

import org.geometerplus.android.util.UIUtil;
import org.geometerplus.android.util.SQLiteUtil;
Solution content 
import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition;

import org.geometerplus.fbreader.book.*;

import org.geometerplus.android.util.UIUtil;
import org.geometerplus.android.util.SQLiteUtil;
File
SQLiteBooksDatabase.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.geometerplus.zlibrary.text.view.ZLTextPosition;

<<<<<<< HEAD:src/org/geometerplus/fbreader/book/Book.java
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.*;
import org.geometerplus.fbreader.library.Library;

=======
>>>>>>> fbec1dc704f166c057e754bb4a651654abeb9f40:src/org/geometerplus/fbreader/library/Book.java
import org.geometerplus.fbreader.Paths;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
Solution content 
import org.geometerplus.zlibrary.text.view.ZLTextPosition;

import org.geometerplus.fbreader.Paths;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
File
Book.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.bookmodel.*;
<<<<<<< HEAD
=======
import org.geometerplus.fbreader.library.*;
>>>>>>> fbec1dc704f166c057e754bb4a651654abeb9f40

public final class FBReaderApp extends ZLApplication {
	public final ZLBooleanOption AllowScreenBrightnessAdjustmentOption =
Solution content 
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.bookmodel.*;

public final class FBReaderApp extends ZLApplication {
	public final ZLBooleanOption AllowScreenBrightnessAdjustmentOption =
File
FBReaderApp.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.xml.*;

<<<<<<< HEAD
import org.geometerplus.fbreader.book.Book;
import org.geometerplus.fbreader.book.Tag;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
=======
import org.geometerplus.fbreader.book.Tag;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.library.Book;
>>>>>>> fbec1dc704f166c057e754bb4a651654abeb9f40

public class FB2MetaInfoReader extends ZLXMLReaderAdapter {
	private final static int READ_NOTHING = 0;
Solution content 
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.xml.*;

import org.geometerplus.fbreader.book.Book;
import org.geometerplus.fbreader.book.Tag;
import org.geometerplus.fbreader.bookmodel.BookReadingException;

public class FB2MetaInfoReader extends ZLXMLReaderAdapter {
	private final static int READ_NOTHING = 0;
File
FB2MetaInfoReader.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
package org.geometerplus.fbreader.library;

import org.geometerplus.fbreader.book.Author;
<<<<<<< HEAD
import org.geometerplus.fbreader.book.Book;
=======
>>>>>>> fbec1dc704f166c057e754bb4a651654abeb9f40
public class AuthorTree extends LibraryTree {
	public final Author Author;
Solution content 
package org.geometerplus.fbreader.library;

import org.geometerplus.fbreader.book.Author;
import org.geometerplus.fbreader.book.Book;

public class AuthorTree extends LibraryTree {
	public final Author Author;
File
AuthorTree.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import java.math.BigDecimal;

<<<<<<< HEAD
import org.geometerplus.fbreader.book.Book;
=======
import org.geometerplus.fbreader.book.SeriesInfo;
>>>>>>> fbec1dc704f166c057e754bb4a651654abeb9f40
import org.geometerplus.fbreader.tree.FBTree;

public final class BookInSeriesTree extends BookTree {
Solution content 
public final class BookInSeriesTree extends BookTree {

import java.math.BigDecimal;

import org.geometerplus.fbreader.book.Book;
import org.geometerplus.fbreader.tree.FBTree;
File
BookInSeriesTree.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.geometerplus.zlibrary.core.image.ZLImage;

<<<<<<< HEAD
import org.geometerplus.fbreader.book.*;
=======
import org.geometerplus.fbreader.book.Author;
>>>>>>> fbec1dc704f166c057e754bb4a651654abeb9f40
import org.geometerplus.fbreader.tree.FBTree;

public class BookTree extends LibraryTree {
Solution content 
import org.geometerplus.zlibrary.core.image.ZLImage;

import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.tree.FBTree;

public class BookTree extends LibraryTree {
File
BookTree.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.geometerplus.zlibrary.core.filesystem.*;
import org.geometerplus.zlibrary.core.resources.ZLResource;

<<<<<<< HEAD
import org.geometerplus.fbreader.book.*;
=======
import org.geometerplus.fbreader.Paths;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
>>>>>>> fbec1dc704f166c057e754bb4a651654abeb9f40
import org.geometerplus.fbreader.tree.FBTree;

public final class Library {
Solution content 
import org.geometerplus.zlibrary.core.filesystem.*;
import org.geometerplus.zlibrary.core.resources.ZLResource;

import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.tree.FBTree;

public final class Library {
File
Library.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.Collections;

<<<<<<< HEAD
import org.geometerplus.fbreader.book.Book;
=======
>>>>>>> fbec1dc704f166c057e754bb4a651654abeb9f40
import org.geometerplus.fbreader.book.SeriesInfo;

public final class SeriesTree extends LibraryTree {
Solution content 
import java.util.Collections;

import org.geometerplus.fbreader.book.Book;
import org.geometerplus.fbreader.book.SeriesInfo;

public final class SeriesTree extends LibraryTree {
File
SeriesTree.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
package org.geometerplus.fbreader.library;

<<<<<<< HEAD
import org.geometerplus.fbreader.book.Book;
=======
>>>>>>> fbec1dc704f166c057e754bb4a651654abeb9f40
import org.geometerplus.fbreader.book.Tag;

public final class TagTree extends LibraryTree {
Solution content 
package org.geometerplus.fbreader.library;

import org.geometerplus.fbreader.book.Book;
import org.geometerplus.fbreader.book.Tag;

public final class TagTree extends LibraryTree {
File
TagTree.java
Developer's decision
Version 1
Kind of conflict
Import