From 5c716f9c0d05213946612a259c9a3f476ad89c72 Mon Sep 17 00:00:00 2001
From: Ryan McGrath <ryan@venodesigns.net>
Date: Wed, 16 Oct 2013 07:46:46 +0900
Subject: [PATCH] Resolve this merge conflict that I somehow 100% totally
 missed (fixes #63)

---
 lib/wrench.js | 64 ++++++++++++++++++---------------------------------
 package.json  |  2 +-
 2 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/lib/wrench.js b/lib/wrench.js
index 1e8b145..d2664ec 100644
--- a/lib/wrench.js
+++ b/lib/wrench.js
@@ -355,30 +355,25 @@ exports.rmdirRecursive = function rmdirRecursive(dir, failSilent, clbk){
         if(err && typeof failSilent === 'boolean' && !failSilent) 
         return clbk(err);
 
-<<<<<<< HEAD
         if(typeof failSilent === 'function')
             clbk = failSilent;
-=======
-    if(typeof failSilent === 'function')
-        clbk = failSilent;
->>>>>>> 7827a700ff8cb8b742e401e9876e86a63ae0c68a
+        
+        (function rmFile(err){
+            if (err) return clbk(err);
 
-            (function rmFile(err){
+            var filename = files.shift();
+            if (filename === null || typeof filename == 'undefined')
+                return fs.rmdir(dir, clbk);
+
+            var file = dir+'/'+filename;
+            fs.lstat(file, function(err, stat){
                 if (err) return clbk(err);
-
-                var filename = files.shift();
-                if (filename === null || typeof filename == 'undefined')
-                    return fs.rmdir(dir, clbk);
-
-                var file = dir+'/'+filename;
-                fs.lstat(file, function(err, stat){
-                    if (err) return clbk(err);
-                    if (stat.isDirectory())
-                        rmdirRecursive(file, rmFile);
-                    else
-                        fs.unlink(file, rmFile);
-                });
-            })();
+                if (stat.isDirectory())
+                    rmdirRecursive(file, rmFile);
+                else
+                    fs.unlink(file, rmFile);
+            });
+        })();
     });
 };
 
@@ -394,31 +389,18 @@ exports.copyDirRecursive = function copyDirRecursive(srcDir, newDir, opts, clbk)
     srcDir = _path.normalize(srcDir);
     newDir = _path.normalize(newDir);
 
-    fs.stat(newDir, function(err, newDirStat){
+    fs.stat(newDir, function(err, newDirStat) {
         if(!err) {
-<<<<<<< HEAD
-		if(typeof opts !== 'undefined' && typeof opts !== 'function' && opts.forceDelete)
-			return exports.rmdirRecursive(newDir, function(err) {
-				copyDirRecursive.apply(this, originalArguments);
-        	});
-		else
-			return clbk(new Error('You are trying to delete a directory that already exists. Specify forceDelete in an options object to override this.'));
-	}
+            if(typeof opts !== 'undefined' && typeof opts !== 'function' && opts.forceDelete)
+                return exports.rmdirRecursive(newDir, function(err) {
+                    copyDirRecursive.apply(this, originalArguments);
+                });
+            else
+                return clbk(new Error('You are trying to delete a directory that already exists. Specify forceDelete in an options object to override this.'));
+        }
 
 	if(typeof opts === 'function')
 		clbk = opts;
-=======
-        if(typeof opts !== 'undefined' && typeof opts !== 'function' && opts.forceDelete)
-            return exports.rmdirRecursive(newDir, function(err){
-                copyDirRecursive.apply(this, arguments);
-                });
-        else
-            return clbk(new Error('You are trying to delete a directory that already exists. Specify forceDelete in an options object to override this.'));
-    }
-
-    if(typeof opts === 'function')
-        clbk = opts;
->>>>>>> 7827a700ff8cb8b742e401e9876e86a63ae0c68a
 
         fs.stat(srcDir, function(err, srcDirStat){
             if (err) return clbk(err);
diff --git a/package.json b/package.json
index 45dc230..9b1c314 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wrench",
   "description": "Recursive filesystem (and other) operations that Node *should* have.",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "author": "Ryan McGrath <ryan@venodesigns.net>",
 
   "repository": {