Skip to content

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
phillipb committed Apr 29, 2020
1 parent c996568 commit 34d1f0b
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions x-pack/plugins/infra/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ import { DataEnhancedSetup, DataEnhancedStart } from '../../data_enhanced/public
import { TriggersAndActionsUIPublicPluginSetup } from '../../../plugins/triggers_actions_ui/public';
import { getAlertType as getMetricsAlertType } from './components/alerting/metrics/metric_threshold_alert_type';
import { getAlertType as getLogsAlertType } from './components/alerting/logs/log_threshold_alert_type';

import { getInventoryMetricAlertType } from './components/alerting/inventory/metric_inventory_threshold_alert_type';
import { getAlertType as getMetricsAlertType } from './components/alerting/metrics/metric_threshold_alert_type';
import { getAlertType as getLogsAlertType } from './components/alerting/logs/log_threshold_alert_type';

export type ClientSetup = void;
export type ClientStart = void;
Expand Down

0 comments on commit 34d1f0b

Please sign in to comment.