chore: address merge issues

bcoe · bcoe · commit 2fd90bd1cb83 · 2020-10-13T10:29:54.000-07:00
diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js
@@ -672,7 +672,7 @@ const defaultRmdirOptions ={
 recursive: false,
 };
 
-const validateRmOptions = hideStackFrames((path, options, callback) =>{
+const validateRmOptions = hideStackFrames((path, options, warn, callback) =>{
 options = validateRmdirOptions(options, defaultRmOptions);
 validateBoolean(options.force, 'options.force');
 

-Original file line number
+Diff line change
 recursive: false,
 };
 -constvalidateRmOptions=hideStackFrames((path,options,callback)=>{
 +constvalidateRmOptions=hideStackFrames((path,options,warn,callback)=>{
 options=validateRmdirOptions(options,defaultRmOptions);
 validateBoolean(options.force,'options.force');