search

ryanmcgrath / wrench-js

Recursive file operations in Node.js
MIT License
435 stars 71 forks source link

Merge artifacts in version 1.5.3 #63

Closed cmisare closed 11 years ago

cmisare commented 11 years ago

The state of version 1.5.3 appears to have some merge conflicts committed into it:

https://github.com/ryanmcgrath/wrench-js/blob/99686fbdc248031b8c494ec085cf6cf59c99530e/lib/wrench.js#L358

https://github.com/ryanmcgrath/wrench-js/blob/99686fbdc248031b8c494ec085cf6cf59c99530e/lib/wrench.js#L399

ryanmcgrath commented 11 years ago

Been awake for 3 days now, must've missed them. HOLD PLEASE.

cmisare commented 11 years ago

No rush or worries. Just wanted to make sure you were aware. The issue popped up in one of our builds and was just passing along the information.

ryanmcgrath commented 11 years ago

I think this should be fine now. This build fixes some things and merges a couple pull requests - let me know if you experience issues.

cmisare commented 11 years ago

Will do, thank you for the exceptionally quick response and I hope you find some sleep soon.