Projects >> lucene-solr >>551554f79068b51a21571e222b999140db86411f

Chunk
Conflicting content 
    return infosReader;
  }
  
<<<<<<< HEAD
=======
  /** expert */
>>>>>>> 94f98ab7f36c63641bfe35fa2216c4781a697156
  public FieldsReader fieldsReader(Directory directory, String segment, FieldInfos fn, IOContext context, int docStoreOffset, int size) throws IOException {
    return new DefaultFieldsReader(directory, segment, fn, context, docStoreOffset, size);
  }
Solution content 
    return infosReader;
  }
  
  /** expert */
  public FieldsReader fieldsReader(Directory directory, String segment, FieldInfos fn, IOContext context, int docStoreOffset, int size) throws IOException {
    return new DefaultFieldsReader(directory, segment, fn, context, docStoreOffset, size);
  }
File
CodecProvider.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
    return new DefaultFieldsReader(directory, segment, fn, context, docStoreOffset, size);
  }

<<<<<<< HEAD
=======
  /** expert */
>>>>>>> 94f98ab7f36c63641bfe35fa2216c4781a697156
  public FieldsWriter fieldsWriter(Directory directory, String segment, IOContext context) throws IOException {
    return new DefaultFieldsWriter(directory, segment, context);
  }
Solution content 
    return new DefaultFieldsReader(directory, segment, fn, context, docStoreOffset, size);
  }

  /** expert */
  public FieldsWriter fieldsWriter(Directory directory, String segment, IOContext context) throws IOException {
    return new DefaultFieldsWriter(directory, segment, context);
  }
File
CodecProvider.java
Developer's decision
Version 2
Kind of conflict
Comment