From 5a8762b3fadfc43880c13a06561f70165fb34f0f Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Fri, 5 Mar 2021 11:42:06 +0100
Subject: [PATCH] fixed merge error

---
 src/PageNav.tsx                           | 3 +--
 src/components/view-header/ViewHeader.tsx | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/PageNav.tsx b/src/PageNav.tsx
index 1b44a4a39e..91120f990d 100644
--- a/src/PageNav.tsx
+++ b/src/PageNav.tsx
@@ -41,8 +41,7 @@ export const PageNav: React.FunctionComponent = () => {
   type LeftNavProps = { title: string; path: string };
   const LeftNav = ({ title, path }: LeftNavProps) => {
     const route = routes(() => {}).find(
-      (route) =>
-        route.path.replaceAll(/\/:.+?(\?|(?:(?!\/).)*|$)/g, "") === path
+      (route) => route.path.replace(/\/:.+?(\?|(?:(?!\/).)*|$)/g, "") === path
     );
     if (!route || !hasAccess(route.access)) return <></>;
     //remove "/realm-name" from the start of the path
diff --git a/src/components/view-header/ViewHeader.tsx b/src/components/view-header/ViewHeader.tsx
index 6afd96cca6..a8fcddec33 100644
--- a/src/components/view-header/ViewHeader.tsx
+++ b/src/components/view-header/ViewHeader.tsx
@@ -163,7 +163,7 @@ export const ViewHeader = ({
           />
         )}
       </PageSection>
-      <Divider component={dividerComponent} />
+      {divider && <Divider component={dividerComponent} />}
     </>
   );
 };