Skip to content

Commit

Permalink
chore(deps): resolve conflicting ember-maybe-import-regenerator
Browse files Browse the repository at this point in the history
  • Loading branch information
buschtoens committed Jun 3, 2019
1 parent 3dfccac commit ecab057
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-notify": "^5.3.0",
"ember-qunit": "4.1.2",
"ember-resolver": "^4.0.0",
Expand All @@ -72,7 +71,7 @@
"babel-core": "^6.24.1",
"ember-cli-babel": "^7.7.3",
"ember-compatibility-helpers": "^1.2.0",
"ember-maybe-import-regenerator": "^0.1.5"
"ember-maybe-import-regenerator": "^0.1.6"
},
"resolutions": {
"ember-qunit/@ember/test-helpers": "1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4473,7 +4473,7 @@ ember-load-initializers@^1.0.0:
dependencies:
ember-cli-babel "^6.6.0"

ember-maybe-import-regenerator@^0.1.5:
ember-maybe-import-regenerator@^0.1.6:
version "0.1.6"
resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca"
integrity sha1-NdQYKK+m1qWbwNo85H80xXPXdso=
Expand Down

0 comments on commit ecab057

Please sign in to comment.