fix: merge

chanzuckerberg · Sep 23, 2024 · 95a8ee1 · 95a8ee1
1 parent f2ee1b0
commit 95a8ee1
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.infra/rdev/values.yaml b/.infra/rdev/values.yaml
@@ -2,11 +2,7 @@ stack:
   services:
     explorer:
       image:
-<<<<<<< HEAD
         tag: sha-31f6c13e
-=======
-        tag: sha-31f6c13e
->>>>>>> f3612dc4 (chore: Updated [rdev] values.yaml image tags to sha-8a9b44be)
       replicaCount: 1
       env:
         # env vars common to all deployment stages