Skip to content

Commit

Permalink
Fix merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
wylieconlon committed Apr 29, 2020
1 parent fb8c322 commit 1615f23
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import { XYArgs, SeriesType, visualizationTypes } from './types';
import { VisualizationContainer } from '../visualization_container';
import { isHorizontalChart } from './state_helpers';
import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
import { getExecuteTriggerActions } from './services';
import { getExecuteTriggerActions } from '../services';
import { parseInterval } from '../../../../../src/plugins/data/common';

type InferPropType<T> = T extends React.FunctionComponent<infer P> ? P : T;
Expand Down

0 comments on commit 1615f23

Please sign in to comment.