Resolve conflicts

pingcap · Sep 10, 2024 · eb02d26 · eb02d26
1 parent 4c5804f
commit eb02d26
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 711 deletions.
diff --git a/en/_index.md b/en/_index.md
@@ -3,11 +3,7 @@ title: TiDB in Kubernetes Documentation
 summary: Learn about TiDB in Kubernetes documentation.
 ---
 
-<<<<<<< HEAD
 # TiDB in Kubernetes Documentation
-=======
-<LearningPathContainer platform="tidb-operator" title="TiDB on Kubernetes Documentation" subTitle="Using TiDB Operator provided by PingCAP, you can run and maintain TiDB seamlessly on the Kubernetes clusters deployed on a public cloud or in a self-managed environment.">
->>>>>>> ec92e21f (en: unify product terms (#2618))
 
 You can use [TiDB Operator](https://github.com/pingcap/tidb-operator) to deploy TiDB clusters in Kubernetes. TiDB Operator is an automatic operation system for TiDB clusters in Kubernetes. It provides full life-cycle management for TiDB including deployment, upgrades, scaling, backup, fail-over, and configuration changes. With TiDB Operator, TiDB can run seamlessly in the Kubernetes clusters deployed on a public or private cloud.