Browse files

Fix merge conflict in doc/api/readline.markdown

  • Loading branch information...
1 parent c15e690 commit 943c396b86103a903af1933e4a5283c8edce2302 @isaacs isaacs committed Mar 13, 2012
Showing with 0 additions and 3 deletions.
  1. +0 −3 doc/api/readline.markdown
3 doc/api/readline.markdown
@@ -52,12 +52,9 @@ Sets the prompt, for example when you run `node` on the command line, you see
Readies readline for input from the user, putting the current `setPrompt`
options on a new line, giving the user a new spot to write.
-<<<<<<< HEAD
This will also resume the `in` stream used with `createInterface` if it has
been paused.
->>>>>>> ry/v0.6
### rl.question(query, callback)
Prepends the prompt with `query` and invokes `callback` with the user's

0 comments on commit 943c396

Please sign in to comment.