Update aggregate-group-by-functions.md

pingcap · Oct 13, 2022 · db7b8c7 · db7b8c7
1 parent d391033
commit db7b8c7
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/functions-and-operators/aggregate-group-by-functions.md b/functions-and-operators/aggregate-group-by-functions.md
@@ -184,14 +184,12 @@ from tbl_name
 group by id, val;
 ```
 
-<<<<<<< HEAD
 ## TiDB 不支持的聚合函数
 
 TiDB 目前不支持的聚合函数如下所示，相关进展参阅 [TiDB #7623](https://github.com/pingcap/tidb/issues/7623)。
 
 - `JSON_ARRAYAGG`
-=======
+
 ## 相关系统变量
 
 `group_concat_max_len` 变量设置 `GROUP_CONCAT()` 函数中的最大项目数。
->>>>>>> 0c875e6a0 (sysvar: add 12 sysvars to docs-cn (#11495))