Better method comment

2019-03-05 12:00:56 +02:00 · 2019-03-05 12:00:56 +02:00 · 5e0996d8ff
parent 9549a1615c
commit 5e0996d8ff
1 changed files with 1 additions and 5 deletions
--- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidator.java
+++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidator.java
@ -255,11 +255,7 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid
 	}
 	
 	/**
-	 * Sets a customized {@link IEnableWhenEvaluator} which is injected to created InstanceValidators 
-<<<<<<< HEAD
-	 * @param myEnableWhenEvaluator
-=======
->>>>>>> master
+	 * Sets a function which creates {@link IEnableWhenEvaluator} instance which is injected to the InstanceValidator created during validation 
 	 */
 	public void setEnableWhenEvaluatorSupplier(
 			Function<IWorkerContext, IEnableWhenEvaluator> enableWhenEvaluatorSupplier) {