Update character-set-and-collation.md

pingcap · Apr 23, 2021 · 365e747 · 365e747
1 parent 01bbf90
commit 365e747
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/character-set-and-collation.md b/character-set-and-collation.md
@@ -63,7 +63,7 @@ SHOW COLLATION WHERE Charset = 'latin1';
 `latin1` Collation（排序规则）分别有以下含义：
 
 | Collation         | 含义                              |
-|:------------------|:----------------------------------|
+| :---------------- | :-------------------------------- |
 | latin1_bin        | latin1 编码的二进制表示           |
 | latin1_danish_ci  | 丹麦语/挪威语，不区分大小写       |
 | latin1_general_ci | 多种语言的 (西欧)，不区分大小写   |
@@ -92,9 +92,9 @@ SHOW COLLATION WHERE Charset = 'latin1';
 * Collation 的后缀表示了 Collation 是否区分大小写和是否区分口音。下面的表展示了这些特性：
 
 | 后缀 | 含义                             |
-|:-----|:---------------------------------|
+| :--- | :------------------------------- |
 | \_ai | 口音不敏感（Accent insensitive） |
-| \_as | 口音敏感 （Accent sensitive）  |
+| \_as | 口音敏感 （Accent sensitive）    |
 | \_ci | 大小写不敏感                     |
 | \_cs | 大小写敏感                       |
 
@@ -129,11 +129,7 @@ ALTER DATABASE db_name
 {{< copyable "sql" >}}
 
 ```sql
-<<<<<<< HEAD
-CREATE SCHEMA test1 CHARACTER SET utf8 COLLATE uft8_general_ci;
-=======
-CREATE SCHEMA test1 CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
->>>>>>> 41d6eac6... Fix a typo in Update character-set-and-collation.md (#6124)
+CREATE SCHEMA test1 CHARACTER SET utf8 COLLATE utf8_general_ci;
 ```
 
 ```
@@ -160,11 +156,7 @@ SELECT @@character_set_database, @@collation_database;
 +--------------------------|----------------------+
 | @@character_set_database | @@collation_database |
 +--------------------------|----------------------+
-<<<<<<< HEAD
-| utf8                     | uft8_general_ci      |
-=======
-| utf8mb4                  | utf8mb4_general_ci   |
->>>>>>> 41d6eac6... Fix a typo in Update character-set-and-collation.md (#6124)
+| utf8                     | utf8_general_ci      |
 +--------------------------|----------------------+
 1 row in set (0.00 sec)
 ```