Update TOC.md

pingcap · Mar 10, 2023 · db901a1 · db901a1
1 parent 4f8b70e
commit db901a1
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/TOC.md b/TOC.md
@@ -356,11 +356,7 @@
       - [`KILL [TIDB]`](/sql-statements/sql-statement-kill.md)
       - [`LOAD DATA`](/sql-statements/sql-statement-load-data.md)
       - [`LOAD STATS`](/sql-statements/sql-statement-load-stats.md)
-<<<<<<< HEAD
-=======
-      - [`LOCK STATS`](/sql-statements/sql-statement-lock-stats.md)
       - [`LOCK TABLES` and `UNLOCK TABLES`](/sql-statements/sql-statement-lock-tables-and-unlock-tables.md)
->>>>>>> 343287e4c (Correct the location of table lock in TOC (#12851))
       - [`MODIFY COLUMN`](/sql-statements/sql-statement-modify-column.md)
       - [`PREPARE`](/sql-statements/sql-statement-prepare.md)
       - [`RECOVER TABLE`](/sql-statements/sql-statement-recover-table.md)