Merge pull request #152 from mike-north/renovate/broccoli-merge-trees…

…-3.x fix(deps): update broccoli-merge-trees to v3
mike-north · Dec 4, 2018 · 28cdee9 · 28cdee9
2 parents 11e87bd + 7c34519
commit 28cdee9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "broccoli-debug": "^0.6.1",
     "broccoli-funnel": "^2.0.1",
-    "broccoli-merge-trees": "^2.0.0",
+    "broccoli-merge-trees": "^3.0.0",
     "broccoli-string-replace": "^0.1.1",
     "ember-cli-babel": "^7.0.0",
     "lodash-es": "^4.17.4"