From 2a5238bedf635337796b08eee5e57e8c5ebdf7f4 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 10 Jul 2020 19:31:24 +0000 Subject: [PATCH] fix(deps): broccoli-merge-trees --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bb0b2b1c..3f372f72 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ ], "dependencies": { "broccoli-funnel": "^2.0.1", - "broccoli-merge-trees": "^3.0.1", + "broccoli-merge-trees": "^4.0.0", "chalk": "2.4.2", "ember-cli-babel": "^7.1.3", "ember-cli-htmlbars": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index 29193c9a..b38c8714 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3862,7 +3862,7 @@ broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2: broccoli-plugin "^1.3.0" merge-trees "^2.0.0" -broccoli-merge-trees@^4.2.0: +broccoli-merge-trees@^4.0.0, broccoli-merge-trees@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c" integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==