Update kustomization.yaml

OCP-on-NERC · Jan 25, 2024 · 2f0b828 · 2f0b828
1 parent e8e2a11
commit 2f0b828
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/clusters/nerc-ocp-infra/kustomization.yaml b/clusters/nerc-ocp-infra/kustomization.yaml
@@ -10,11 +10,7 @@ resources:
   - openshift-gitops
   - vault
   - acm
-<<<<<<< HEAD
   - loki
-=======
-  - xdmod
->>>>>>> ed3fb3eb34662412e9d3d6e15ab877e995e572b1
   - grafana
   - hostpath-provisioner
 

diff --git a/clusters/nerc-ocp-obs/kustomization.yaml b/clusters/nerc-ocp-obs/kustomization.yaml
@@ -44,4 +44,3 @@ patches:
       - op: replace
         path: /spec/source/path
         value: logging/overlays/nerc-ocp-obs
-