From 0865068a26f4dc77790aff15147cb5303520abe4 Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Mon, 18 May 2020 11:31:46 +0100
Subject: [PATCH] fixed merge conflict

---
 x-pack/plugins/encrypted_saved_objects/server/plugin.ts         | 2 +-
 .../encrypted_saved_objects/server/saved_objects/index.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
index 3cb7a7dface2e1..865d678cc035e6 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
@@ -46,7 +46,7 @@ export interface LegacyAPI {
  */
 export class Plugin {
   private readonly logger: Logger;
-  private savedObjectsSetup!: (includedHiddenTypes?: string[]) => SavedObjectsSetup;
+  private savedObjectsSetup!: SavedObjectsSetup;
 
   private legacyAPI?: LegacyAPI;
   private readonly getLegacyAPI = () => {
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
index 58de8ddca03ddf..dadeaf92e145c8 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
@@ -38,7 +38,7 @@ export function setupSavedObjects({
   savedObjects,
   security,
   getStartServices,
-}: SetupSavedObjectsParams): (includedHiddenTypes?: string[]) => SavedObjectsSetup {
+}: SetupSavedObjectsParams): SavedObjectsSetup {
   // Register custom saved object client that will encrypt, decrypt and strip saved object
   // attributes where appropriate for any saved object repository request. We choose max possible
   // priority for this wrapper to allow all other wrappers to set proper `namespace` for the Saved