From fb5f1107d3c10d10477ebbf5377b20306c51f260 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 19 May 2022 16:45:28 +0200 Subject: [PATCH] kubernetes: fix merge conflict of getMatchingHpa call Signed-off-by: Patrik Oldsberg --- .../StatefulSetsAccordions/StatefulSetsAccordions.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetsAccordions.tsx b/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetsAccordions.tsx index 978f4d1632..bb1c4821ba 100644 --- a/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetsAccordions.tsx +++ b/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetsAccordions.tsx @@ -183,8 +183,11 @@ export const StatefulSetsAccordions = ({}: StatefulSetsAccordionsProps) => {