Adrien Grand 3f86adddbf Remove MergeMappingException. ... Failures to merge a mapping can either come as a MergeMappingException if they come from Mapper.merge or as an IllegalArgumentException if they come from FieldTypeLookup.checkCompatibility. I think we should settle on one: this pull request replaces all usage of MergeMappingException with IllegalArgumentException.		2015-12-04 12:56:26 +01:00
..
src	Remove MergeMappingException.	2015-12-04 12:56:26 +01:00
build.gradle	Switch build system to Gradle	2015-10-29 11:40:19 -07:00