Projects >> lucene-solr >>5ea36eb99247e0629a4559afab25adf1cf2f4dc9

Chunk
Conflicting content 
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CannedTokenStream;
import org.apache.lucene.analysis.MockAnalyzer;
<<<<<<< HEAD
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.Analyzer.TokenStreamComponents;
import org.apache.lucene.codecs.Codec;
=======
>>>>>>> 61166afce792d038dac6911b8033c8d8017562f1
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsFormat;
Solution content 
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CannedTokenStream;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsFormat;
File
BasePostingsFormatTestCase.java
Developer's decision
Combination
Kind of conflict
Import