From ecab0575f60e3123fe1f90ffc192644d2dab3b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= Date: Mon, 3 Jun 2019 14:16:12 +0200 Subject: [PATCH] chore(deps): resolve conflicting `ember-maybe-import-regenerator` --- package.json | 3 +-- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b77aec7e2..027bf3d30 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", diff --git a/yarn.lock b/yarn.lock index beb50d2f2..6d38224de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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=