From 66208608bb1428a306ebcfad2842d4539ef869ae Mon Sep 17 00:00:00 2001 From: Constance Date: Tue, 22 Jun 2021 15:21:48 -0700 Subject: [PATCH] Fix bad merge conflict --- .../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 7b8f90b2a643ca..fa024d50d027da 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 @@ -141,7 +141,7 @@ export const EngineRouter: React.FC = () => { )} {canViewEngineApiLogs && ( - master + )} {/* TODO: Remove layout once page template migration is over */}