fix: conflict

metcoder95 · metcoder95 · commit 3a9f173e9674 · 2024-03-16T13:58:37.000+01:00
diff --git a/lib/handler/retry-handler.js b/lib/handler/retry-handler.js
@@ -158,7 +158,7 @@ class RetryHandler {
     const retryTimeout =
       retryAfterHeader > 0
         ? Math.min(retryAfterHeader, maxTimeout)
-        : Math.min(timeout * timeoutFactor ** counter, maxTimeout)
+        : Math.min(minTimeout * timeoutFactor ** counter, maxTimeout)
 
     setTimeout(() => cb(null), retryTimeout)
   }

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ class RetryHandler {`
`158`	`158`	`const retryTimeout =`
`159`	`159`	`retryAfterHeader > 0`
`160`	`160`	`? Math.min(retryAfterHeader, maxTimeout)`
`161`		`- : Math.min(timeout * timeoutFactor ** counter, maxTimeout)`
	`161`	`+ : Math.min(minTimeout * timeoutFactor ** counter, maxTimeout)`
`162`	`162`
`163`	`163`	`setTimeout(() => cb(null), retryTimeout)`
`164`	`164`	`}`