Bump broccoli-merge-trees from 3.0.2 to 4.1.0

Bumps [broccoli-merge-trees](https://github.com/broccolijs/broccoli-merge-trees) from 3.0.2 to 4.1.0. - [Release notes](https://github.com/broccolijs/broccoli-merge-trees/releases) - [Changelog](https://github.com/broccolijs/broccoli-merge-trees/blob/master/CHANGELOG.md) - [Commits](broccolijs/broccoli-merge-trees@v3.0.2...v4.1.0) Signed-off-by: dependabot-preview[bot] <[email protected]>
jrjohnson · Jan 4, 2020 · 8b22f4f · 8b22f4f
1 parent 5979377
commit 8b22f4f
Show file tree

Hide file tree

Showing 2 changed files with 179 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
   "dependencies": {
     "broccoli-caching-writer": "^3.0.3",
     "broccoli-funnel": "^2.0.1",
-    "broccoli-merge-trees": "^3.0.0",
+    "broccoli-merge-trees": "^4.1.0",
     "ember-cli-babel": "^7.11.1",
     "ember-cli-htmlbars": "^4.0.0",
     "rsvp": "^4.7.0",