From fb04e853550dca8a3b5ea794f96051aa40c6ad9a Mon Sep 17 00:00:00 2001 From: Constance Date: Mon, 21 Jun 2021 14:39:11 -0700 Subject: [PATCH] Fix bad merge conflict resolution --- .../applications/app_search/components/engine/engine_router.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx index fb8961959dff0e..218f8b3ee26161 100644 --- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx @@ -103,7 +103,7 @@ export const EngineRouter: React.FC = () => { - }) + )} {canManageEngineSearchUi && (