From 4d753365a3f1b0ee68d18105573f85d53e86dc5f Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 3 Oct 2023 19:22:06 -0400 Subject: [PATCH] changed secondsBeforeTimeout to timeout added timeoutValidation() added functions to README.md --- yarn.lock | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/yarn.lock b/yarn.lock index d13ef8786d017..cc3884b49ff45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11276,19 +11276,31 @@ node-addon-api@^3.2.1: resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== +<<<<<<< HEAD <<<<<<< HEAD node-addon-api@^4.2.0: version "4.3.0" resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== ======= +======= +>>>>>>> b320d3435f (changed secondsBeforeTimeout to timeout) node-dir@^0.1.17: version "0.1.17" resolved "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5" integrity sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg== dependencies: minimatch "^3.0.2" +<<<<<<< HEAD >>>>>>> c68ea4453b (fix(custom-resources): IAM policy incorrect for SDKv3 names (#27313)) +======= +======= +node-addon-api@^4.2.0: + version "4.3.0" + resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" + integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== +>>>>>>> 44b757fee1 (changed secondsBeforeTimeout to timeout) +>>>>>>> b320d3435f (changed secondsBeforeTimeout to timeout) node-fetch@2.6.7: version "2.6.7"