From 5e0996d8ff68a82cfe8b5ce160ebd017bd927586 Mon Sep 17 00:00:00 2001
From: Matti Uusitalo <ext-matti.uusitalo@kela.fi>
Date: Tue, 5 Mar 2019 12:00:56 +0200
Subject: [PATCH] Better method comment

---
 .../fhir/dstu3/hapi/validation/FhirInstanceValidator.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git 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
index e1865154b0b..28695adf0eb 100644
--- 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) {