| Chunk |
|---|
| Conflicting content |
|---|
protected abstract void add(int base, AtomicIndexReader r) throws IOException;
}
<<<<<<< HEAD
=======
>>>>>>> e4cc1d009c71cba7f94b4183599cb4579aec4cc8
public static ReaderContext buildReaderContext(IndexReader reader) {
return new ReaderContextBuilder(reader).build();
} |
| Solution content |
|---|
protected abstract void add(int base, AtomicIndexReader r) throws IOException;
}
public static ReaderContext buildReaderContext(IndexReader reader) {
return new ReaderContextBuilder(reader).build();
} |
| File |
|---|
| ReaderUtil.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |