修改config
解决conflict
Merge pull request #2 from pinguo-liangyunzhu/dev

修改config