Skip to content

Commit 2b5b382

Browse files
committed
chore(deps): broccoli-merge-trees
1 parent 3b5531f commit 2b5b382

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.1.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
@@ -2996,12 +2996,12 @@ broccoli-lint-eslint@^5.0.0:
29962996
lodash.defaultsdeep "^4.6.0"
29972997
md5-hex "^2.0.0"
29982998

2999-
broccoli-merge-trees@3.0.2, broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
3000-
version "3.0.2"
3001-
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
3002-
integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
2999+
broccoli-merge-trees@4.1.0, broccoli-merge-trees@^4.1.0:
3000+
version "4.1.0"
3001+
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.1.0.tgz#a30e2e4c5bb0f5eb8981e8af33a8077714c11f1a"
3002+
integrity sha512-1OXsksKPFiRdiZZOfh1z1mm7ZqKezlMS+DPBpHMDLSb6AhYHvoQfjf0KuMXbY8aoYskj7+Z+EJ5SsS/OC2v5yw==
30033003
dependencies:
3004-
broccoli-plugin "^1.3.0"
3004+
broccoli-plugin "^3.1.0"
30053005
merge-trees "^2.0.0"
30063006

30073007
broccoli-merge-trees@^1.0.0:
@@ -3026,12 +3026,12 @@ broccoli-merge-trees@^2.0.0:
30263026
broccoli-plugin "^1.3.0"
30273027
merge-trees "^1.0.1"
30283028

3029-
broccoli-merge-trees@^4.1.0:
3030-
version "4.1.0"
3031-
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.1.0.tgz#a30e2e4c5bb0f5eb8981e8af33a8077714c11f1a"
3032-
integrity sha512-1OXsksKPFiRdiZZOfh1z1mm7ZqKezlMS+DPBpHMDLSb6AhYHvoQfjf0KuMXbY8aoYskj7+Z+EJ5SsS/OC2v5yw==
3029+
broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
3030+
version "3.0.2"
3031+
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
3032+
integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
30333033
dependencies:
3034-
broccoli-plugin "^3.1.0"
3034+
broccoli-plugin "^1.3.0"
30353035
merge-trees "^2.0.0"
30363036

30373037
broccoli-middleware@^2.1.0:

0 commit comments

Comments
 (0)