Fix missed merge resolution

nasa · Mar 19, 2018 · 5d9ad5d · 5d9ad5d
1 parent acb7ede
commit 5d9ad5d
Showing 1 changed file with 0 additions and 10 deletions.
diff --git 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) {