fix: conflict

codeceptjs · Oct 31, 2023 · f99200d · f99200d
1 parent 496b3fd
commit f99200d
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/lib/command/run-workers.js b/lib/command/run-workers.js
@@ -51,21 +51,6 @@ module.exports = async function (workerCount, selectedRuns, options) {
     output.test.passed(test);
   });
 
-<<<<<<< HEAD
-  workers.on(event.step.failed, (step) => {
-    failedStepArr.push(step);
-  });
-
-  workers.on(event.step.passed, (step) => {
-    passedStepArr.push(step);
-  });
-
-  workers.on(event.step.skipped, (step) => {
-    skippedStepArr.push(step);
-  });
-
-=======
->>>>>>> d68ee620 (fix: attach step object to test object)
   workers.on(event.all.result, () => {
     // expose test stats after all workers finished their execution
     event.dispatcher.emit(event.workers.result, {