resolve conflict

pingcap · Nov 21, 2023 · f7ab8a1 · f7ab8a1
1 parent 2c0f0ff
commit f7ab8a1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/sql-statements/sql-statement-show-index.md b/sql-statements/sql-statement-show-index.md
diff --git a/sql-statements/sql-statement-show-indexes.md b/sql-statements/sql-statement-show-indexes.md
@@ -1,6 +1,7 @@
 ---
 title: SHOW INDEXES [FROM|IN] | TiDB SQL Statement Reference
 summary: An overview of the usage of SHOW INDEXES [FROM|IN] for the TiDB database.
+aliases: ['/tidb/v7.4/sql-statement-show-index/', '/tidb/v7.4/sql-statement-show-keys/']
 ---
 
 # SHOW INDEXES [FROM|IN]

diff --git a/sql-statements/sql-statement-show-keys.md b/sql-statements/sql-statement-show-keys.md