fix: conflict

SocialGouv · May 6, 2024 · d1cba47 · d1cba47
1 parent ac01682
commit d1cba47
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/charts/pgadmin/Chart.yaml b/charts/pgadmin/Chart.yaml
@@ -3,11 +3,6 @@ name: pgadmin
 version: 1.27.2
 dependencies:
   - name: oauth2-proxy
-<<<<<<< HEAD
     version: "^1.27.2"
-    repository: file://./charts/oauth2-proxy
-=======
-    version: "^1.26.12"
     repository: https://socialgouv.github.io/helm-charts
->>>>>>> b83df8d (feat: move oatuh chart away from pgadmin)
     condition: oauth2-proxy.enabled