Skip to content

Commit

Permalink
Merge pull request #583 from emberjs/dependabot/npm_and_yarn/eslint-c…
Browse files Browse the repository at this point in the history
…onfig-prettier-6.5.0
  • Loading branch information
dependabot-preview[bot] authored Oct 28, 2019
2 parents 4d75b34 + 8ac4207 commit cfad079
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 @@ -51,7 +51,7 @@
"ember-source-channel-url": "^1.0.1",
"ember-try": "^1.2.1",
"eslint": "^5.16.0",
"eslint-config-prettier": "^6.4.0",
"eslint-config-prettier": "^6.5.0",
"eslint-plugin-disable-features": "^0.1.3",
"eslint-plugin-prettier": "^3.1.1",
"lerna-changelog": "^0.8.2",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3708,10 +3708,10 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=

eslint-config-prettier@^6.4.0:
version "6.4.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.4.0.tgz#0a04f147e31d33c6c161b2dd0971418ac52d0477"
integrity sha512-YrKucoFdc7SEko5Sxe4r6ixqXPDP1tunGw91POeZTTRKItf/AMFYt/YLEQtZMkR2LVpAVhcAcZgcWpm1oGPW7w==
eslint-config-prettier@^6.5.0:
version "6.5.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.5.0.tgz#aaf9a495e2a816865e541bfdbb73a65cc162b3eb"
integrity sha512-cjXp8SbO9VFGW/Z7mbTydqS9to8Z58E5aYhj3e1+Hx7lS9s6gL5ILKNpCqZAFOVYRcSkWPFYljHrEh8QFEK5EQ==
dependencies:
get-stdin "^6.0.0"

Expand Down

0 comments on commit cfad079

Please sign in to comment.