fix merge conflict

FINTLabs · Dec 17, 2024 · cad8ded · cad8ded
1 parent 8e589cf
commit cad8ded
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/kustomize/overlays/beta/fintlabs-no/kustomization.yaml b/kustomize/overlays/beta/fintlabs-no/kustomization.yaml
@@ -2,11 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../../base
-<<<<<<< HEAD
 patches:
   - path: flais.yaml
-
-=======
 patchesStrategicMerge:
   - config-map.yaml
   - one-password.yaml
@@ -18,4 +15,3 @@ commonLabels:
   app.kubernetes.io/part-of: fint-core
   fintlabs.no/team: core
   fintlabs.no/org-id: fintlabs.no
->>>>>>> main