Resolved conflict

openmrs · Dec 8, 2021 · fa388ec · fa388ec
1 parent 3142dd5
commit fa388ec
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.../main/java/org/openmrs/module/fhir2/api/translators/impl/RelatedPersonTranslatorImpl.java b/.../main/java/org/openmrs/module/fhir2/api/translators/impl/RelatedPersonTranslatorImpl.java
@@ -15,10 +15,10 @@
 
 import java.util.Date;
 
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import lombok.AccessLevel;
 import lombok.Setter;
 import org.hl7.fhir.r4.model.Address;
-import org.hl7.fhir.r4.model.DateType;
 import org.hl7.fhir.r4.model.HumanName;
 import org.hl7.fhir.r4.model.Identifier;
 import org.hl7.fhir.r4.model.Period;

diff --git a/...rc/main/java/org/openmrs/module/fhir2/providers/r4/RelatedPersonFhirResourceProvider.java b/...rc/main/java/org/openmrs/module/fhir2/providers/r4/RelatedPersonFhirResourceProvider.java
@@ -42,8 +42,8 @@
 import org.hl7.fhir.r4.model.OperationOutcome;
 import org.hl7.fhir.r4.model.RelatedPerson;
 import org.openmrs.module.fhir2.api.FhirRelatedPersonService;
-import org.openmrs.module.fhir2.providers.util.FhirProviderUtils;
 import org.openmrs.module.fhir2.api.annotations.R4Provider;
+import org.openmrs.module.fhir2.providers.util.FhirProviderUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/...est/java/org/openmrs/module/fhir2/api/translators/impl/LocationTagTranslatorImplTest.java b/...est/java/org/openmrs/module/fhir2/api/translators/impl/LocationTagTranslatorImplTest.java
@@ -70,4 +70,4 @@ public void toOpenmrsType_shouldReturnExistingTagIfTagExists() {
 		assertThat(existingLocationTag, notNullValue());
 		assertThat(existingLocationTag.getName(), is(LAB_TAG_NAME));
 	}
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
     		assertThat(existingLocationTag, notNullValue());
     		assertThat(existingLocationTag.getName(), is(LAB_TAG_NAME));
     	}
-    }
+    }