feat: merge

This commit is contained in:
suxiaoxin 2017-07-17 16:24:47 +08:00
commit 5f7b66ebfa

View File

@ -1,6 +1,7 @@
{
"env": {
"browser": true,
"node": true,
"commonjs": true
},
"extends": [],