chore: update conflict file

apecloud · Mar 20, 2023 · e6db179 · e6db179
1 parent a37eaf6
commit e6db179
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/deploy/apecloud-mysql/values.yaml b/deploy/apecloud-mysql/values.yaml
@@ -7,11 +7,7 @@ image:
   repository: apecloud/apecloud-mysql-server
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-<<<<<<< HEAD
   tag: 8.0.30-5.alpha3.20230228.g50d8966.5
-=======
-  tag: 8.0.30-5.alpha2.20230105.gd6b8719.2
->>>>>>> 818796ce (move apecloud-mysql-rep to apecloud-mysql,use the same helm chart.)
 
 ## MySQL Cluster parameters
 cluster:
@@ -68,4 +64,4 @@ metrics:
     registry: registry.cn-hangzhou.aliyuncs.com
     repository: apecloud/mysqld-exporter
     tag: 0.14.1
-    pullPolicy: IfNotPresent
+    pullPolicy: IfNotPresent