Jaison B f22ca6f318 # Conflicts: ... # hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java # hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java		2021-12-03 09:13:15 -07:00
..
src	# Conflicts:	2021-12-03 09:13:15 -07:00
.editorconfig	Fix handling of filters on valueset expansions	2017-02-10 11:05:59 -05:00
.gitignore	Switch DSTU2.1 to DSTU3 per FMB's decision	2016-02-01 08:55:58 -05:00
pom.xml	# Conflicts:	2021-12-03 09:13:15 -07:00
todo.txt	Fix #440 - Don't depend on Saxon	2016-09-08 15:56:15 -04:00