From 5d9ad5d617cfa4aabc97312eae3fb26b9095522f Mon Sep 17 00:00:00 2001 From: Marc Huffnagle Date: Mon, 19 Mar 2018 17:03:25 -0400 Subject: [PATCH] Fix missed merge resolution --- packages/api/lambdas/jobs.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/packages/api/lambdas/jobs.js b/packages/api/lambdas/jobs.js index f9b0b05d70a..7c38385772a 100644 --- a/packages/api/lambdas/jobs.js +++ b/packages/api/lambdas/jobs.js @@ -130,17 +130,7 @@ async function cleanup() { const limit = pLimit(2); -<<<<<<< HEAD - await Promise.all( - executions.slice(0, 400).map( - (ex) => limit( - () => checkExecution(ex.arn, ex.execution, ex.timestamp, esClient) - ) - ) - ); -======= await Promise.all(executions.slice(0, 400).map((ex) => limit(() => checkExecution(ex.arn, ex.execution, ex.timestamp, esClient)))); ->>>>>>> master } function handler(event, context, cb) {