From 74fb377620fd1cfbfe31f514e49d3dc2cb1f57ed Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Wed, 20 Nov 2019 11:28:21 +0100
Subject: [PATCH] fix conflict (#51147)

---
 .../core_plugins/kibana/public/dashboard/index.ts      |  2 +-
 .../core_plugins/kibana/public/dashboard/plugin.ts     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/index.ts b/src/legacy/core_plugins/kibana/public/dashboard/index.ts
index 111806701c829e..d134739aa24c26 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/index.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/index.ts
@@ -53,7 +53,7 @@ async function getAngularDependencies(): Promise<LegacyAngularInjectedDependenci
 (async () => {
   const instance = new DashboardPlugin();
   instance.setup(npSetup.core, {
-    feature_catalogue: npSetup.plugins.feature_catalogue,
+    ...npSetup.plugins,
     __LEGACY: {
       localApplicationService,
       getAngularDependencies,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
index 32f09c3eeab852..780fa6571e4e79 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
@@ -36,8 +36,8 @@ import { NavigationStart } from '../../../navigation/public';
 import { DashboardConstants } from './dashboard_constants';
 import {
   FeatureCatalogueCategory,
-  FeatureCatalogueSetup,
-} from '../../../../../plugins/feature_catalogue/public';
+  HomePublicPluginSetup,
+} from '../../../../../plugins/home/public';
 import { SharePluginStart } from '../../../../../plugins/share/public';
 
 export interface LegacyAngularInjectedDependencies {
@@ -59,7 +59,7 @@ export interface DashboardPluginSetupDependencies {
     getAngularDependencies: () => Promise<LegacyAngularInjectedDependencies>;
     localApplicationService: LocalApplicationService;
   };
-  feature_catalogue: FeatureCatalogueSetup;
+  home: HomePublicPluginSetup;
 }
 
 export class DashboardPlugin implements Plugin {
@@ -76,7 +76,7 @@ export class DashboardPlugin implements Plugin {
     core: CoreSetup,
     {
       __LEGACY: { localApplicationService, getAngularDependencies, ...legacyServices },
-      feature_catalogue,
+      home,
     }: DashboardPluginSetupDependencies
   ) {
     const app: App = {
@@ -120,7 +120,7 @@ export class DashboardPlugin implements Plugin {
     localApplicationService.register({ ...app, id: 'dashboard' });
     localApplicationService.register({ ...app, id: 'dashboards' });
 
-    feature_catalogue.register({
+    home.featureCatalogue.register({
       id: 'dashboard',
       title: i18n.translate('kbn.dashboard.featureCatalogue.dashboardTitle', {
         defaultMessage: 'Dashboard',