Skip to content

Commit

Permalink
Merge pull request #7017 from emberjs/dependabot/npm_and_yarn/eslint-…
Browse files Browse the repository at this point in the history
…config-prettier-6.10.0
  • Loading branch information
dependabot-preview[bot] authored Jan 29, 2020
2 parents 01e1e15 + cdc255d commit 005ff4d
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 @@ -105,7 +105,7 @@
"ember-source-channel-url": "^2.0.1",
"ember-try": "^1.4.0",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.9.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-ember": "^7.7.2",
"eslint-plugin-ember-data": "link:./packages/unpublished-eslint-rules",
"eslint-plugin-import": "^2.19.1",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7059,10 +7059,10 @@ escodegen@^1.11.0:
optionalDependencies:
source-map "~0.6.1"

eslint-config-prettier@^6.9.0:
version "6.9.0"
resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.9.0.tgz#430d24822e82f7deb1e22a435bfa3999fae4ad64"
integrity sha512-k4E14HBtcLv0uqThaI6I/n1LEqROp8XaPu6SO9Z32u5NlGRC07Enu1Bh2KEFw4FNHbekH8yzbIU9kUGxbiGmCA==
eslint-config-prettier@^6.10.0:
version "6.10.0"
resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz#7b15e303bf9c956875c948f6b21500e48ded6a7f"
integrity sha512-AtndijGte1rPILInUdHjvKEGbIV06NuvPrqlIEaEaWtbtvJh464mDeyGMdZEQMsGvC0ZVkiex1fSNcC4HAbRGg==
dependencies:
get-stdin "^6.0.0"

Expand Down

0 comments on commit 005ff4d

Please sign in to comment.