Apply suggestions from code review

pingcap · May 22, 2023 · 7aae5ed · 7aae5ed
1 parent 8868c7a
commit 7aae5ed
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/sql-statements/sql-statement-load-data.md b/sql-statements/sql-statement-load-data.md
@@ -1,11 +1,7 @@
 ---
 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))
+aliases: ['/docs-cn/dev/sql-statements/sql-statement-load-data/','/docs-cn/dev/reference/sql/statements/load-data/','/zh/tidb/dev/sql-statement-operate-load-data-job','/zh/tidb/dev/sql-statement-show-load-data']
 ---
 
 # LOAD DATA