Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1487: Reduced test case #1500

Merged
merged 4 commits into from
Jul 28, 2017
Merged

Fix #1487: Reduced test case #1500

merged 4 commits into from
Jul 28, 2017

Conversation

chrisbreiding
Copy link
Contributor

This is a modification of #1490 that addresses issues raised by @fatso83.

@fatso83
Copy link
Contributor

fatso83 commented Jul 27, 2017

Great stuff. Could you remove the conflict with the master branch as well, and just amend the last commit?

@coveralls
Copy link

coveralls commented Jul 28, 2017 •
edited
Loading

Coverage Status

Coverage increased (+0.005%) to 95.522% when pulling b7ce6dd on cypress-io:issues/#1487 into cbf1128 on sinonjs:master.

@chrisbreiding
Copy link
Contributor Author

I rebased master. Not sure if that's exactly what you had in mind, but it fixed the conflict.

@fatso83 fatso83 merged commit 0d099aa into sinonjs:master Jul 28, 2017
@fatso83
Copy link
Contributor

fatso83 commented Jul 28, 2017

Thanks!

@fatso83 fatso83 mentioned this pull request Jul 28, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fatso83 fatso83 fatso83 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chrisbreiding @fatso83 @coveralls