Fixed merge conflict

elastic · Apr 8, 2020 · 42cac76 · 42cac76
1 parent 653790a
commit 42cac76
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/...ontrols/components/simple_number_list.tsx → ...ontrols/components/simple_number_list.tsx b/...ontrols/components/simple_number_list.tsx → ...ontrols/components/simple_number_list.tsx
diff --git a/...c/components/controls/include_exclude.tsx → ...c/components/controls/include_exclude.tsx b/...c/components/controls/include_exclude.tsx → ...c/components/controls/include_exclude.tsx
@@ -21,7 +21,7 @@ import React, { useEffect } from 'react';
 import { isArray } from 'lodash';
 import { AggParamEditorProps } from '../agg_param_props';
 import { StringParamEditor } from './string';
-import { search } from '../../../../../../plugins/data/public/';
+import { search } from '../../../../data/public';
 import { SimpleNumberList } from './components/simple_number_list';
 const { isNumberType } = search.aggs;