Generated Image New Tag

kustomization/overlays/prod/kustomization.yaml

@@ -17,4 +17,8 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/ims
+<<<<<<< HEAD
   newTag: 710ed85fcf0bb1899d3fead60a638d29cd6b2cb7
+=======
+  newTag: ae05d4c5c8344ff931d88bfabdf672104b90d73a
+>>>>>>> a5f0e5c (Generated Image New Tag)