Merge branch 'master' into greenkeeper/eslint-6.0.0

GetRayo · Jul 9, 2019 · 4927882 · 4927882
2 parents fcc90ec + 0e3c432
commit 4927882
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "coveralls": "^3.0.4",
     "eslint": "^6.0.0",
     "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-config-prettier": "^5.0.0",
+    "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-import": "^2.17.3",
     "eslint-plugin-prettier": "^3.1.0",
     "lerna": "^3.15.0",