Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-impo…

…rt-2.18.2
pro-vision · Aug 21, 2019 · ec0640d · ec0640d
2 parents bf53a3b + 8021ac1
commit ec0640d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "eslint": "5.16.0",
-    "eslint-config-prettier": "4.3.0",
+    "eslint-config-prettier": "6.1.0",
     "eslint-plugin-import": "2.18.2",
     "eslint-plugin-prettier": "3.1.0",
     "jest": "24.8.0",