Resolve this merge conflict that I somehow 100% totally missed (fixes #63)

This commit is contained in:
Ryan McGrath 2013-10-16 07:46:46 +09:00
parent 99686fbdc2
commit 5c716f9c0d
2 changed files with 24 additions and 42 deletions

View file

@ -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": {