Skip to content

Commit

Permalink
Merge 1c31fc7 into 2b91853
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot[bot] committed Apr 29, 2019
2 parents 2b91853 + 1c31fc7 commit 80210c0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@fisker/eslint-config": "^1.0.7",
"@fisker/eslint-config-jest": "^1.0.1",
"@fisker/lint-staged-config": "^1.0.1",
"@fisker/prettier-config": "^1.0.11",
"@fisker/prettier-config": "^1.0.12",
"babel-jest": "^24.7.1",
"babel-polyfill": "^6.26.0",
"cz-conventional-changelog-emoji": "^0.1.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -801,10 +801,10 @@
dependencies:
"@fisker/eslint-config" "^1.0.5"

"@fisker/prettier-config@^1.0.11":
version "1.0.11"
resolved "https://registry.npm.taobao.org/@fisker/prettier-config/download/@fisker/prettier-config-1.0.11.tgz#58f413bb11665da02b7f508047021a047d255a90"
integrity sha1-WPQTuxFmXaArf1CARwIaBH0lWpA=
"@fisker/prettier-config@^1.0.12":
version "1.0.12"
resolved "https://registry.yarnpkg.com/@fisker/prettier-config/-/prettier-config-1.0.12.tgz#161be5931cc4ec659371c1a56340d7113c525008"
integrity sha512-HSGkDUkhmHYgBN2k6qNcZ9Ey/OBOTPLZOblLutGNP0uwoTj5WjBSQu5qyl/P2LOr7R8iNOz8XQ9AeBRv7Pw9lw==

"@jest/console@^24.7.1":
version "24.7.1"
Expand Down

0 comments on commit 80210c0

Please sign in to comment.