| Chunk |
|---|
| Conflicting content |
|---|
import java.io.File;
import java.util.*;
<<<<<<< HEAD
=======
import org.geometerplus.zlibrary.core.filesystem.*;
import org.geometerplus.zlibrary.text.view.ZLTextPosition;
import org.geometerplus.fbreader.Paths;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
public abstract class BookCollection extends AbstractBookCollection {
>>>>>>> aaded888d4c0d2484277f613ce76638fa5f4cbb7
import org.geometerplus.zlibrary.core.filesystem.*;
|
| Solution content |
|---|
import java.io.File; import java.util.*; import org.geometerplus.zlibrary.core.filesystem.*; |
| File |
|---|
| BookCollection.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Class signature |
| Import |