chore: fix rebase error

SwissDataScienceCenter · Oct 21, 2024 · 82c9265 · 82c9265
1 parent c792721
commit 82c9265
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/helm-chart/renku/templates/gateway/secret.yaml b/helm-chart/renku/templates/gateway/secret.yaml
@@ -99,14 +99,6 @@ data:
   notebooksClientSecret: {{ $notebooksClientSecret }}
   # A secret for the UI server client in Keycloak
   uiserverClientSecret: {{ $uiserverClientSecret }}
-<<<<<<< HEAD
-  {{- if .Values.gitlab.enabled }}
-  # A secret for the Gitlab client in Keycloak if an internal Gitlab is used
-  gitlabClientInKeycloakSecret: {{ $gitlabClientInKeycloakSecret }}
-  {{- end }}
   cookieEncodingKey: {{ $csrfCookieEncodingKey }}
   cookieHashKey: {{ $csrfCookieHashKey }}
   tokenEncryption: {{ $tokenEncryptionSecretKey }}
-
-=======
->>>>>>> 3a1c9a47 (feat: remove internal gitlab)