diff --git a/.travis.yml b/.travis.yml index a269295..03b2079 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ cache: yarn: true env: - - EMBER_TRY_SCENARIO=ember-2.18.X - EMBER_TRY_SCENARIO=ember-3.4.X - EMBER_TRY_SCENARIO=ember-3.5.X - EMBER_TRY_SCENARIO=ember-3.6.X diff --git a/config/ember-try.js b/config/ember-try.js index bbfdac7..8382c65 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -2,14 +2,6 @@ module.exports = { useYarn: true, scenarios: [ - { - name: 'ember-2.18.X', - npm: { - devDependencies: { - 'ember-source': '~2.18.0' - } - } - }, { name: 'ember-3.4.X', npm: { diff --git a/yarn.lock b/yarn.lock index cca80c8..c8b7d0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4908,8 +4908,9 @@ merge-trees@^2.0.0: heimdalljs "^0.2.5" merge@^1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" + version "1.2.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" + integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== methods@~1.1.2: version "1.1.2"