Skip to content

Commit

Permalink
Merge pull request #88 from omairrazam/master
Browse files Browse the repository at this point in the history
Only merge tree if present in treeForVendor
  • Loading branch information
ritesh83 authored Jul 30, 2018
2 parents 29c95ee + d49df6b commit b94affe
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ module.exports = {
destDir: "ember-cli-jstree"
});

return mergeTrees([tree, registerVersionTree, jsTree, stylesTree], {
overwrite: true
});

return tree ? mergeTrees([tree, registerVersionTree, jsTree, stylesTree], {overwrite: true}) : mergeTrees([registerVersionTree, jsTree, stylesTree], {overwrite: true});
},

treeForPublic() {
Expand Down

0 comments on commit b94affe

Please sign in to comment.