spring-projects/spring-data-elasticsearch — pull request #85 by vershinin (2014-12-08 13:02:42+00:00)
Title: Delete MappingBuilder.java.rej

It looks like merge conflict file has been commited...