mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-05-10 08:15:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix hanging conflicts

Browse source
This commit is contained in:
d98762625 2020-03-20 13:10:31 +00:00
parent a49d97f898
commit 5f0a2393df
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/core/Chef.mjs
View file

@ -38,18 +38,15 @@ class Chef {
* @returns {number} response.error - The error object thrown by a failed operation (false if no error) * @returns {number} response.error - The error object thrown by a failed operation (false if no error)
*/ */
async bake(input, recipeConfig, options) { async bake(input, recipeConfig, options) {
<<<<<<< HEAD
const startTime = new Date().getTime(),
recipe = await Recipe.buildRecipe(recipeConfig),
=======
log.debug("Chef baking"); log.debug("Chef baking");
const startTime = Date.now(),
recipe = new Recipe(recipeConfig), const startTime = new Date().now();
>>>>>>> 26b19350f2dffacfb1bce8ded689a09aa42355db const recipe = await Recipe.buildRecipe(recipeConfig);
containsFc = recipe.containsFlowControl(), const containsFc = recipe.containsFlowControl();
notUTF8 = options && "treatAsUtf8" in options && !options.treatAsUtf8; const notUTF8 = options && "treatAsUtf8" in options && !options.treatAsUtf8;
let error = false,
progress = 0; let error = false;
let progress = 0;
if (containsFc && isWorkerEnvironment()) self.setOption("attemptHighlight", false); if (containsFc && isWorkerEnvironment()) self.setOption("attemptHighlight", false);