This is an automated cherry-pick of #14031

Signed-off-by: ti-chi-bot <[email protected]>
pingcap · May 22, 2023 · 8868c7a · 8868c7a
1 parent cad2ccd
commit 8868c7a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/sql-statements/sql-statement-load-data.md b/sql-statements/sql-statement-load-data.md
@@ -1,7 +1,11 @@
 ---
 title: LOAD DATA
 summary: TiDB 数据库中 LOAD DATA 的使用概况。
+<<<<<<< HEAD
 aliases: ['/docs-cn/dev/sql-statements/sql-statement-load-data/','/docs-cn/dev/reference/sql/statements/load-data/']
+=======
+aliases: ['/zh/tidb/v7.0/sql-statement-operate-load-data-job','/zh/tidb/v7.0/sql-statement-show-load-data']
+>>>>>>> 9cef2dfb78 (LOAD DATA: remove two sql statements (#14031))
 ---
 
 # LOAD DATA