NoLog.cz/decide.nolog.cz
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

broccoli-merge-trees not needed anymore since app.toTree() supports multiple trees as argument

Browse source
This commit is contained in:
jelhan 2016-08-14 18:00:15 +02:00
parent 36c7dc397c
commit b2885ffcf5
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ember-cli-build.js
View file

@ -66,7 +66,5 @@ module.exports = function() {
);
}
trees.push(app.toTree());
const mergeTrees = require('broccoli-merge-trees');
return mergeTrees(trees);
return app.toTree(trees);
};

1
package.json
View file

@ -21,7 +21,6 @@
"body-parser": "^1.2.0",
"broccoli-asset-rev": "^2.2.0",
"broccoli-funnel": "^1.0.6",
"broccoli-merge-trees": "^0.2.1",
"broccoli-unwatched-tree": "^0.1.1",
"connect-restreamer": "^1.0.1",
"cors": "^2.5.3",