changed code
try
提交
merge branch 'dev' of https://github.com/fex-team/kitycharts into dev

提示合并
kitycharts
conflict