From 5f0a2393dfc0f13d2eae8fbac1bbcbe4dc4e88d2 Mon Sep 17 00:00:00 2001
From: d98762625 <d98762625@gmail.com>
Date: Fri, 20 Mar 2020 13:10:31 +0000
Subject: [PATCH] fix hanging conflicts

---
 src/core/Chef.mjs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

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