Skip to content

Commit

Permalink
Merge pull request #7 from hoksilato/develop
Browse files Browse the repository at this point in the history
Allow overwriting default configs
  • Loading branch information
linslin committed Jan 29, 2015
2 parents a01406d + 40dd841 commit 7953ec6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Curl.php
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public function getOption($key)
*/
public function getOptions()
{
return $this->_defaultOptions + $this->_options;
return $this->_options + $this->_defaultOptions;
}


Expand Down

0 comments on commit 7953ec6

Please sign in to comment.