Apply suggestions from code review

pingcap · Feb 28, 2024 · a359703 · a359703
1 parent 8422793
commit a359703
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/enable-tls-between-clients-and-servers.md b/enable-tls-between-clients-and-servers.md
@@ -1,11 +1,6 @@
 ---
 title: Enable TLS Between TiDB Clients and Servers
-<<<<<<< HEAD
-summary: Use the encrypted connection to ensure data security.
-=======
 summary: Use secure connections to ensure data security.
-aliases: ['/docs/dev/enable-tls-between-clients-and-servers/','/docs/dev/how-to/secure/enable-tls-clients/','/docs/dev/encrypted-connections-with-tls-protocols/']
->>>>>>> 65c1fd271f (Various TLS related updates (#16267))
 ---
 
 # Enable TLS between TiDB Clients and Servers