update to faster merge-trees

adopted-ember-addons · Dec 13, 2015 · 5112929 · 5112929
1 parent 657c4c7
commit 5112929
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
   "author": "@aexmachina",
   "license": "MIT",
   "dependencies": {
-    "broccoli-merge-trees": "^0.2.1",
+    "broccoli-merge-trees": "^1.1.0",
     "broccoli-sass-source-maps": "^1.4.0",
     "ember-cli-version-checker": "^1.0.2",
     "merge": "^1.2.0"