resolve conflicts

pingcap · Dec 1, 2023 · cbcde7f · cbcde7f
1 parent 17a5b44
commit cbcde7f
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/en/deploy-on-general-kubernetes.md b/en/deploy-on-general-kubernetes.md
@@ -82,13 +82,8 @@ This document describes how to deploy a TiDB cluster on general Kubernetes.
     docker save -o ticdc-v7.5.0.tar pingcap/ticdc:v7.5.0
     docker save -o tiflash-v7.5.0.tar pingcap/tiflash:v7.5.0
     docker save -o tidb-monitor-reloader-v1.0.1.tar pingcap/tidb-monitor-reloader:v1.0.1
-<<<<<<< HEAD
-    docker save -o tidb-monitor-initializer-v7.1.1.tar pingcap/tidb-monitor-initializer:v7.1.1
-    docker save -o grafana-7.5.11.tar grafana/grafana:7.5.11
-=======
     docker save -o tidb-monitor-initializer-v7.5.0.tar pingcap/tidb-monitor-initializer:v7.5.0
-    docker save -o grafana-6.0.1.tar grafana/grafana:7.5.11
->>>>>>> 638db370 (en,zh: Bump tidb components to v7.5.0 (#2467))
+    docker save -o grafana-7.5.11.tar grafana/grafana:7.5.11
     docker save -o prometheus-v2.18.1.tar prom/prometheus:v2.18.1
     docker save -o busybox-1.26.2.tar busybox:1.26.2
     ```