From 6fa556884666b040de01cc7221534602bac4f640 Mon Sep 17 00:00:00 2001
From: ppisljar <peter.pisljar@gmail.com>
Date: Sun, 22 Mar 2020 23:44:29 -0700
Subject: [PATCH] fixing merge

---
 .../vis_default_editor/public/components/agg.test.tsx        | 1 -
 .../public/components/sidebar/state/reducers.ts              | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx
index 699a3f25bd3a5..feb5b3caa023b 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx
@@ -22,7 +22,6 @@ import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 
 import { IndexPattern, IAggType, AggGroupNames } from 'src/plugins/data/public';
-import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 
 import { DefaultEditorAgg, DefaultEditorAggProps } from './agg';
 import { DefaultEditorAggParams } from './agg_params';
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/reducers.ts b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
index 6d9d5c4eb425c..6e5bec7c69c90 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
@@ -35,7 +35,10 @@ export type EditorVisState = Pick<Vis, 'title' | 'description' | 'type' | 'param
 
 const createEditorStateReducer = ({
   aggs: { createAggConfigs },
-}: DataPublicPluginStart['search']) => (state: EditorVisState, action: EditorAction): VisState => {
+}: DataPublicPluginStart['search']) => (
+  state: EditorVisState,
+  action: EditorAction
+): EditorVisState => {
   switch (action.type) {
     case EditorStateActionTypes.ADD_NEW_AGG: {
       const { schema } = action.payload;