Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix merge conflicts, fixes #53

  • Loading branch information...
commit aa93b74cb260dc6e66909b156a031bbf00136ad2 1 parent 43dedd5
@kriszyp authored
Showing with 1 addition and 9 deletions.
  1. +1 −9 README.md
View
10 README.md
@@ -176,7 +176,6 @@ you would call it:
fs.rename(path1, path2).then(function(){
// finished renaming
});
-<<<<<<< HEAD
Any callback arguments will be the same minus the error argument:
@@ -186,8 +185,6 @@ Any callback arguments will be the same minus the error argument:
}, function(error) {
// Handle errors here instead
});
-=======
->>>>>>> get rid of some trailing spaces
One function that does differ from NodeJS's fs module is the open() function.
@@ -287,13 +284,8 @@ This function returns the last element in a lazy array.
## get
item = require("promised-io/lazy-array").get(index);
-<<<<<<< HEAD
-
-This function returns an element by index from a lazy array.
-=======
-This function returns the an element by index from a lazy array.
->>>>>>> get rid of some trailing spaces
+This function returns an element by index from a lazy array.
# http-client
Please sign in to comment.
Something went wrong with that request. Please try again.