Revision 1645925

Jump to revision:
Author:	romseygeek
Date:	Tue Dec 16 11:33:02 2014 UTC (9 years, 4 months ago)
Changed paths:	3
Log Message:	LUCENE-2878: merge conflicts

Changed paths

Path	Details
lucene/dev/branches/lucene2878/	modified , props changed
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java	modified , text changed
lucene/dev/branches/lucene2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java	deleted