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/test/java/ca/uhn/fhir/rest/client	Migrate to JUnit5 (#1952)	2020-07-04 18:28:16 -04:00
pom.xml	# Conflicts:	2021-12-03 09:13:15 -07:00