From 2c0f0ff4cd961ea7bdd70aa0d6e3fd5f89d95904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Tue, 21 Nov 2023 09:24:28 +0100 Subject: [PATCH] Fix merge conflicts --- TOC-tidb-cloud.md | 6 ------ TOC.md | 6 ------ sql-statements/sql-statement-show-indexes.md | 4 ---- 3 files changed, 16 deletions(-) diff --git a/TOC-tidb-cloud.md b/TOC-tidb-cloud.md index 51c6d6c1eb48c..c99ced1cf2dcd 100644 --- a/TOC-tidb-cloud.md +++ b/TOC-tidb-cloud.md @@ -432,13 +432,7 @@ - [`SHOW ERRORS`](/sql-statements/sql-statement-show-errors.md) - [`SHOW [FULL] FIELDS FROM`](/sql-statements/sql-statement-show-fields-from.md) - [`SHOW GRANTS`](/sql-statements/sql-statement-show-grants.md) -<<<<<<< HEAD - - [`SHOW INDEX [FROM|IN]`](/sql-statements/sql-statement-show-index.md) - [`SHOW INDEXES [FROM|IN]`](/sql-statements/sql-statement-show-indexes.md) - - [`SHOW KEYS [FROM|IN]`](/sql-statements/sql-statement-show-keys.md) -======= - - [`SHOW INDEXES`](/sql-statements/sql-statement-show-indexes.md) ->>>>>>> eb247c2815 (Remove duplicate docs for SHOW INDEX, SHOW KEYS in favor of SHOW INDEXES (#15364)) - [`SHOW MASTER STATUS`](/sql-statements/sql-statement-show-master-status.md) - [`SHOW PLACEMENT`](/sql-statements/sql-statement-show-placement.md) - [`SHOW PLACEMENT FOR`](/sql-statements/sql-statement-show-placement-for.md) diff --git a/TOC.md b/TOC.md index 71ff6de377c9a..1899e54f71ac9 100644 --- a/TOC.md +++ b/TOC.md @@ -812,13 +812,7 @@ - [`SHOW [FULL] FIELDS FROM`](/sql-statements/sql-statement-show-fields-from.md) - [`SHOW GRANTS`](/sql-statements/sql-statement-show-grants.md) - [`SHOW IMPORT JOB`](/sql-statements/sql-statement-show-import-job.md) -<<<<<<< HEAD - - [`SHOW INDEX [FROM|IN]`](/sql-statements/sql-statement-show-index.md) - [`SHOW INDEXES [FROM|IN]`](/sql-statements/sql-statement-show-indexes.md) - - [`SHOW KEYS [FROM|IN]`](/sql-statements/sql-statement-show-keys.md) -======= - - [`SHOW INDEXES`](/sql-statements/sql-statement-show-indexes.md) ->>>>>>> eb247c2815 (Remove duplicate docs for SHOW INDEX, SHOW KEYS in favor of SHOW INDEXES (#15364)) - [`SHOW MASTER STATUS`](/sql-statements/sql-statement-show-master-status.md) - [`SHOW PLACEMENT`](/sql-statements/sql-statement-show-placement.md) - [`SHOW PLACEMENT FOR`](/sql-statements/sql-statement-show-placement-for.md) diff --git a/sql-statements/sql-statement-show-indexes.md b/sql-statements/sql-statement-show-indexes.md index e2b9562f90d2b..5058b93ea38b7 100644 --- a/sql-statements/sql-statement-show-indexes.md +++ b/sql-statements/sql-statement-show-indexes.md @@ -1,10 +1,6 @@ --- title: SHOW INDEXES [FROM|IN] | TiDB SQL Statement Reference summary: An overview of the usage of SHOW INDEXES [FROM|IN] for the TiDB database. -<<<<<<< HEAD -======= -aliases: ['/docs/dev/sql-statements/sql-statement-show-indexes/','/docs/dev/reference/sql/statements/show-indexes/', '/tidb/dev/sql-statement-show-index/', '/tidb/dev/sql-statement-show-keys/'] ->>>>>>> eb247c2815 (Remove duplicate docs for SHOW INDEX, SHOW KEYS in favor of SHOW INDEXES (#15364)) --- # SHOW INDEXES [FROM|IN]