diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO99HealthDocumentRecordDoc20190801.json b/src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO99HealthDocumentRecordDoc20190801.json index dc67e22b..8c738284 100644 --- a/src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO99HealthDocumentRecordDoc20190801.json +++ b/src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO99HealthDocumentRecordDoc20190801.json @@ -206,4 +206,8 @@ } } ] +<<<<<<< HEAD + } +======= } +>>>>>>> 47ebb81c65ba79a33f7dacffacc60b8066fc99dd