From 7ea309cc3c13bff37270873bd631cae4a8ec15c9 Mon Sep 17 00:00:00 2001 From: MisanthropicBit Date: Mon, 5 Feb 2024 17:04:29 +0100 Subject: [PATCH] Remove git conflict marker --- src/mocha-multi-reporter.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/mocha-multi-reporter.ts b/src/mocha-multi-reporter.ts index 5119a27..61f1c95 100644 --- a/src/mocha-multi-reporter.ts +++ b/src/mocha-multi-reporter.ts @@ -89,21 +89,11 @@ function MultiReporter(this: MultiReporterThis, runner: mocha.Runner, options: m } } -<<<<<<< HEAD inherits(MultiReporter, Base) -MultiReporter.prototype.done = function(failures: number, fn?: (failures: number) => void): void { - const doneableReporters = this.reporters.filter((reporter: typeof Base) => - typeof reporter.prototype.done === "function" -||||||| parent of 5a02983 (Eslint fixes) -MultiReporter.prototype.done = function(failures: number, fn?: (failures: number) => void): void { - const doneableReporters = this.reporters.filter((reporter: typeof Base) => - typeof reporter.prototype.done === "function" -======= MultiReporter.prototype.done = function (failures: number, fn?: (failures: number) => void): void { const doneableReporters = this.reporters.filter( (reporter: typeof Base) => typeof reporter.prototype.done === 'function' ->>>>>>> 5a02983 (Eslint fixes) ) for (const reporter of doneableReporters) {