resolve conflict

Signed-off-by: Ran <huangran.alex@gmail.com>
pingcap · May 25, 2022 · 86cc760 · 86cc760
1 parent 097827c
commit 86cc760
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 106 deletions.
diff --git a/_index.md b/_index.md
@@ -1,10 +1,7 @@
 ---
 title: TiDB Introduction
 summary: Learn about the NewSQL database TiDB that supports HTAP workloads.
-<<<<<<< HEAD
-=======
-aliases: ['/docs/dev/','/docs/dev/adopters/','/tidb/dev/adopters']
->>>>>>> c895704e1 (delete adopters.md (#8725))
+aliases: ['/tidb/v6.0/adopters']
 ---
 
 # TiDB Introduction

diff --git a/adopters.md b/adopters.md