From 259fc8a8c035c8ee3be018a77596ae180e68a97a Mon Sep 17 00:00:00 2001
From: sulemanof <sul-dan@mail.ru>
Date: Thu, 27 Feb 2020 12:30:27 +0300
Subject: [PATCH] Resolve merge conflicts

---
 .../kibana/public/visualize/legacy_imports.ts      |  1 -
 .../public/visualize/np_ready/application.ts       | 14 --------------
 2 files changed, 15 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
index d9059a8249dd3..21694ff329d74 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
@@ -27,7 +27,6 @@
 export { PersistedState } from 'ui/persisted_state';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore
-// @ts-ignore
 export { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url';
 export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
 export { KibanaParsedUrl } from 'ui/url/kibana_parsed_url';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
index 717f6a91020d6..8ef63ec5778e2 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
@@ -86,7 +86,6 @@ function createLocalAngularModule(core: AppMountContext['core'], navigation: Nav
   createLocalPrivateModule();
   createLocalPromiseModule();
   createLocalKbnUrlModule();
-  createLocalStateModule();
   createLocalTopNavModule(navigation);
 
   const visualizeAngularModule: IModule = angular.module(moduleName, [
@@ -100,19 +99,6 @@ function createLocalAngularModule(core: AppMountContext['core'], navigation: Nav
   return visualizeAngularModule;
 }
 
-function createLocalStateModule() {
-  angular
-    .module('app/visualize/State', [
-      'app/visualize/Private',
-      'app/visualize/Config',
-      'app/visualize/KbnUrl',
-      'app/visualize/Promise',
-    ])
-    .service('globalState', function(Private: IPrivate) {
-      return Private(GlobalStateProvider);
-    });
-}
-
 function createLocalKbnUrlModule() {
   angular
     .module('app/visualize/KbnUrl', ['app/visualize/Private', 'ngRoute'])