Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/dependabot/npm_and_yarn/…
Browse files Browse the repository at this point in the history
…eslint-config-prettier-8.1.0' into next
  • Loading branch information
rintaun committed Mar 17, 2021
2 parents cc2ff47 + 80e367f commit d5eec52
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 @@ -63,7 +63,7 @@
"@typescript-eslint/parser": "^4.9.1",
"config": "^3.3.3",
"eslint": "^7.15.0",
"eslint-config-prettier": "^7.0.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-jsonc": "^1.2.1",
"eslint-plugin-prettier": "^3.2.0",
"husky": "^5.0.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2710,10 +2710,10 @@ escodegen@^1.14.1:
optionalDependencies:
source-map "~0.6.1"

eslint-config-prettier@^7.0.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.1.0.tgz#5402eb559aa94b894effd6bddfa0b1ca051c858f"
integrity sha512-9sm5/PxaFG7qNJvJzTROMM1Bk1ozXVTKI0buKOyb0Bsr1hrwi0H/TzxF/COtf1uxikIK8SwhX7K6zg78jAzbeA==
eslint-config-prettier@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6"
integrity sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==

eslint-plugin-jsonc@^1.2.1:
version "1.2.1"
Expand Down

0 comments on commit d5eec52

Please sign in to comment.