chore: resolved conflicts

golemfactory · Oct 17, 2023 · 0c5101d · 0c5101d
1 parent 42834ef
commit 0c5101d
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/executor/executor.ts b/src/executor/executor.ts
@@ -500,7 +500,6 @@ export class TaskExecutor {
    * Sets a timeout for waiting for offers from the market.
    * If at least one offer is not confirmed during the set timeout,
    * a critical error will be reported and the entire process will be interrupted.
-   * @private
    */
   private setStartupTimeout() {
     this.startupTimeoutId = setTimeout(() => {