feat: merge

This commit is contained in:
sean 2017-07-17 16:24:47 +08:00
commit 9cd843d3a6

View File

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