Merge pull request #980 from kstekovi/WFLY-19949

Wfly 19949 and Wfly 19971
wildfly · Nov 20, 2024 · 2d499c4 · 2d499c4
2 parents aa98d25 + 1bc616e
commit 2d499c4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/logging/src/charts/helm.yaml → logging/charts/helm.yaml b/logging/src/charts/helm.yaml → logging/charts/helm.yaml
@@ -1,10 +1,6 @@
 build:
   uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
-  ref: 31.x-glow-preview
-=======
   ref: main
->>>>>>> upstream/main
   contextDir: logging
 deploy:
   replicas: 1