Issue134 #149

Closed
wants to merge 2 commits into
from

Conversation

Projects
None yet
3 participants
Contributor

Bodhisattva2-0 commented Jun 8, 2012

Added a deprecation warning for the scenario when should_not_receive is followed by and_return.

This pull request passes (merged a1bc823 into 49ce496).

Contributor

Bodhisattva2-0 commented Jun 8, 2012

mangled my git history. Both 133 and 134 are mentioned in this pull request. Please ignore issue commit 9d8e81d.

Owner

dchelimsky commented Jun 8, 2012

Ignore the commit or the commit message?

Contributor

Bodhisattva2-0 commented Jun 9, 2012

The commit. Please look at a1bc823 alone as it deals with Issue #134.

Owner

dchelimsky commented Jun 9, 2012

Do you know how to get your local branch into the right state and push --force to the issue134 branch in github? If so, please do that. It's better if I can just merge the pull request from github.

Owner

dchelimsky commented Jun 11, 2012

Moved to #151

dchelimsky closed this Jun 11, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment