Fix merge conflicts.

This commit is contained in:
ianmarshall 2020-06-04 17:57:38 -04:00
parent 78b7f091ec
commit 549993886d
1 changed files with 0 additions and 8 deletions

View File

@ -55,14 +55,6 @@ public class LastNElasticsearchSvcMultipleObservationsIT {
}
}
@After
public void after() throws IOException {
elasticsearchSvc.deleteAllDocumentsForTest(ElasticsearchSvcImpl.OBSERVATION_INDEX);
elasticsearchSvc.deleteAllDocumentsForTest(ElasticsearchSvcImpl.OBSERVATION_CODE_INDEX);
elasticsearchSvc.refreshIndex(ElasticsearchSvcImpl.OBSERVATION_INDEX);
elasticsearchSvc.refreshIndex(ElasticsearchSvcImpl.OBSERVATION_CODE_INDEX);
}
@Test
public void testLastNAllPatientsQuery() {