Skip to content

Commit b7b64d9

Browse files
committed
chore(deps): broccoli-merge-trees
1 parent 06ef769 commit b7b64d9

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@types/ember": "3.0.27",
3030
"broccoli-asset-rev": "3.0.0",
3131
"broccoli-funnel": "2.0.2",
32-
"broccoli-merge-trees": "3.0.2",
32+
"broccoli-merge-trees": "4.2.0",
3333
"broccoli-stew": "2.1.0",
3434
"ember-cli-app-version": "3.2.0",
3535
"ember-cli-dependency-checker": "3.2.0",

yarn.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3169,12 +3169,12 @@ broccoli-lint-eslint@^5.0.0:
31693169
lodash.defaultsdeep "^4.6.0"
31703170
md5-hex "^2.0.0"
31713171

3172-
broccoli-merge-trees@3.0.2, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
3173-
version "3.0.2"
3174-
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
3175-
integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
3172+
broccoli-merge-trees@4.2.0, broccoli-merge-trees@^4.1.0, broccoli-merge-trees@^4.2.0:
3173+
version "4.2.0"
3174+
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c"
3175+
integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==
31763176
dependencies:
3177-
broccoli-plugin "^1.3.0"
3177+
broccoli-plugin "^4.0.2"
31783178
merge-trees "^2.0.0"
31793179

31803180
broccoli-merge-trees@^1.0.0:
@@ -3199,12 +3199,12 @@ broccoli-merge-trees@^2.0.0:
31993199
broccoli-plugin "^1.3.0"
32003200
merge-trees "^1.0.1"
32013201

3202-
broccoli-merge-trees@^4.1.0, broccoli-merge-trees@^4.2.0:
3203-
version "4.2.0"
3204-
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c"
3205-
integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==
3202+
broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
3203+
version "3.0.2"
3204+
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
3205+
integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
32063206
dependencies:
3207-
broccoli-plugin "^4.0.2"
3207+
broccoli-plugin "^1.3.0"
32083208
merge-trees "^2.0.0"
32093209

32103210
broccoli-middleware@^2.1.1:

0 commit comments

Comments
 (0)