Skip to content
Browse files

Update docs

  • Loading branch information...
1 parent 5e06dcb commit ae36c4aa3d80f247b3109cb6c086c1a6508c10c7 @smfreegard smfreegard committed May 8, 2012
Showing with 0 additions and 4 deletions.
  1. +0 −4 docs/Outbound.md
View
4 docs/Outbound.md
@@ -135,7 +135,6 @@ To do that, you can use the `outbound` module directly:
outbound.send_email(from, to, contents, outnext);
-<<<<<<< Updated upstream
The callback on `send_email()` is passed `OK` if the mail is successfully
queued to disk, not when it is successfully delivered. To check delivery
status you still need to hook `delivered` and `bounce` to know if it was
@@ -145,6 +144,3 @@ The callback parameter may be omitted if you don't need to handle errors
should queueing to disk fail e.g:
outbound.send_email(form, to, contents);
-
-=======
->>>>>>> Stashed changes

0 comments on commit ae36c4a

Please sign in to comment.
Something went wrong with that request. Please try again.