Merge branch 'master' into depfu/update/npm/lint-staged-8.1.3

This commit is contained in:
Brian Lovin 2019-02-04 08:01:58 -08:00 committed by GitHub
commit 7fd0f48028
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

6
package-lock.json generated
View file

@ -7963,9 +7963,9 @@
"dev": true
},
"prettier": {
"version": "1.16.3",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.16.3.tgz",
"integrity": "sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==",
"version": "1.16.4",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.16.4.tgz",
"integrity": "sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==",
"dev": true
},
"prettier-eslint": {

View file

@ -48,7 +48,7 @@
"eslint-plugin-react": "^7.12.4",
"flow-bin": "^0.91.0",
"lint-staged": "^8.1.3",
"prettier": "^1.16.3",
"prettier": "^1.16.4",
"prettier-eslint": "^8.8.2"
},
"lint-staged": {