Skip to content

Commit

Permalink
Fix bad merge. Match master.
Browse files Browse the repository at this point in the history
  • Loading branch information
John Schulz committed Jun 26, 2020
1 parent 82af414 commit 4761eb6
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions x-pack/test/security_solution_endpoint/services/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { services as apiIntegrationServices } from '../../api_integration/services';
import { services as xPackFunctionalServices } from '../../functional/services';
import { EndpointPolicyTestResourcesProvider } from './endpoint_policy';
import { IngestManagerProvider } from '../../common/services/ingest_manager';

export const services = {
...xPackFunctionalServices,
ingestManager: apiIntegrationServices.ingestManager,
policyTestResources: EndpointPolicyTestResourcesProvider,
ingestManager: IngestManagerProvider,
};

0 comments on commit 4761eb6

Please sign in to comment.