Merge branch 'main' into main

nodejs · Nov 23, 2022 · 3071e59 · 3071e59
2 parents 85eacae + 6efcd35
commit 3071e59
Showing 1 changed file with 0 additions and 4 deletions.
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)
   }