fix merge conflict

elastic · Jun 4, 2020 · 6378956 · 6378956
1 parent fcf38d4
commit 6378956
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 1 deletion.
diff --git a/x-pack/legacy/plugins/reporting/.chromium/chromium-312d84c-darwin.zip b/x-pack/legacy/plugins/reporting/.chromium/chromium-312d84c-darwin.zip
diff --git a/x-pack/legacy/plugins/reporting/.chromium/chromium-312d84c-linux.zip b/x-pack/legacy/plugins/reporting/.chromium/chromium-312d84c-linux.zip
diff --git a/x-pack/legacy/plugins/reporting/.chromium/chromium-312d84c-windows.zip b/x-pack/legacy/plugins/reporting/.chromium/chromium-312d84c-windows.zip
diff --git a/x-pack/plugins/index_management/public/application/sections/home/home.tsx b/x-pack/plugins/index_management/public/application/sections/home/home.tsx
@@ -126,7 +126,7 @@ export const IndexManagementHome: React.FunctionComponent<RouteComponentProps<Ma
           <Route exact path={`/${Section.Indices}/filter/:filter?`} component={IndexList} />
           <Route
             exact
-            path={[`/${Section.IndexTemplates}`, `/${Section.IndexTemplates}/:templateName*`]}
+            path={[`/${Section.IndexTemplates}`, `/${Section.IndexTemplates}/:templateName?`]}
             component={TemplateList}
           />
           <Route exact path={`/${Section.ComponentTemplates}`} component={ComponentTemplateList} />