From 4b09d2bd8e3e93f81780af4be4634d2b71672527 Mon Sep 17 00:00:00 2001 From: biswajit-9776 Date: Sat, 20 Jul 2024 15:46:38 +0530 Subject: [PATCH] Resolved conflict Signed-off-by: biswajit-9776 --- contrib/security/PSS/static/restricted/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/security/PSS/static/restricted/kustomization.yaml b/contrib/security/PSS/static/restricted/kustomization.yaml index 0b0db4660..bc566efe9 100644 --- a/contrib/security/PSS/static/restricted/kustomization.yaml +++ b/contrib/security/PSS/static/restricted/kustomization.yaml @@ -3,4 +3,4 @@ kind: Component patches: - path: patches/kubeflow-labels.yaml -- path: patches/istio-labels.yaml +- path: patches/istio-labels.yaml \ No newline at end of file