Resolve conflict after merge master to dev-1.18.

This commit is contained in:
Irvi Firqotul Aini
2020-01-16 21:17:16 +08:00
-1
View File
@@ -162,7 +162,6 @@ aliases:
- gochist
- ianychoi
- seokho-son
- ysyukr
sig-docs-maintainers: # Website maintainers
- bradamant3
- jimangel