mirror of
https://github.com/gchq/CyberChef.git
synced 2025-04-20 14:56:19 -04:00
Merge conflicts
This commit is contained in:
commit
03fc22d3da
11 changed files with 218 additions and 13 deletions
|
@ -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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue