Merge branch 'main' into main

jaxoncreed · web-flow · commit 3071e5951181 · 2022-11-23T17:26:53.000-05:00
diff --git a/lib/internal/validators.js b/lib/internal/validators.js
@@ -125,11 +125,7 @@ const validateUint32 = hideStackFrames((value, name, positive = false) => {
   }
   const min = positive ? 1 : 0
   // 2 ** 32 === 4294967296
-<<<<<<< HEAD
   const max = 4294967295
-=======
-  const max = 4_294_967_295
->>>>>>> 6efcd35 (chore: just build to fix whitespace issues (#498))
   if (value < min || value > max) {
     throw new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value)
   }

Original file line number	Diff line number	Diff line change
`@@ -125,11 +125,7 @@ const validateUint32 = hideStackFrames((value, name, positive = false) => {`
`125`	`125`	`}`
`126`	`126`	`const min = positive ? 1 : 0`
`127`	`127`	`// 2 ** 32 === 4294967296`
`128`		`-<<<<<<< HEAD`
`129`	`128`	`const max = 4294967295`
`130`		`-=======`
`131`		`- const max = 4_294_967_295`
`132`		`->>>>>>> 6efcd35 (chore: just build to fix whitespace issues (#498))`
`133`	`129`	`if (value < min \|\| value > max) {`
`134`	`130`	throw new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value)
`135`	`131`	`}`