Merge conflicts

This commit is contained in:
n1474335 2017-05-06 13:47:26 +01:00
commit 03fc22d3da
11 changed files with 218 additions and 13 deletions

View file

@ -40,13 +40,13 @@ import Chef from "../src/core/Chef.js";
this.tests.map(function(test, i) {
let chef = new Chef();
return Promise.resolve(chef.bake(
return chef.bake(
test.input,
test.recipeConfig,
{},
0,
false
))
)
.then(function(result) {
let ret = {
test: test,