Skip to content

Commit

Permalink
Merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
delatbabel committed Jan 14, 2016
1 parent d1d6a9a commit ea56bde
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/Gateway.php
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ public function parseNotification(array $parameters = array())
$parameters['bt_signature'],
$parameters['bt_payload']
);

}

/**
* @param array $parameters
* @return Message\FindRequest
Expand Down

0 comments on commit ea56bde

Please sign in to comment.