dumb

broadinstitute · Feb 12, 2024 · 4ca2c1d · 4ca2c1d
1 parent 3f004be
commit 4ca2c1d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/charts/datarepo-api/templates/role.yaml b/charts/datarepo-api/templates/role.yaml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-{{- if .Values.rbac.pspEnabled -}}
-=======
 {{- if .Values.rbac.create | and .Values.pspEnabled -}}
->>>>>>> 43912b03 (separate values)
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata: