Skip to content
Permalink
Browse files

Merge branch 'master' into greenkeeper/eslint-plugin-promise-4.0.0

  • Loading branch information...
feross committed Aug 28, 2018
2 parents 5420668 + c20b700 commit e3f573fda01f51fcf589ddb1043690e25151d096
Showing with 2 additions and 2 deletions.
  1. +1 −1 eslintrc.json
  2. +1 −1 package.json
@@ -1,6 +1,6 @@
{
"parserOptions": {
"ecmaVersion": 9,
"ecmaVersion": 2018,
"ecmaFeatures": {
"jsx": true
},
@@ -13,7 +13,7 @@
"devDependencies": {
"eslint": "^5.0.0-alpha.2",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-node": "^6.0.0",
"eslint-plugin-node": "^7.0.0",
"eslint-plugin-promise": "^4.0.0",
"eslint-plugin-standard": "^3.0.1",
"tape": "^4.8.0"

0 comments on commit e3f573f

Please sign in to comment.
You can’t perform that action at this time.