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.

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

Fix test after merging #332 (2f47dfc62321b) #371

Merged
merged 1 commit into from
Oct 12, 2021
Merged

Conversation

theckman
Copy link
Collaborator

In between raising #332 and merging it, there were changes to the master branch
that resulted in the tests in this PR breaking after the merge.

In hindsight, this branch should have been rebased against master before merging
the PR.

In between raising #332 and merging it, there were changes to the master branch
that resulted in the tests in this PR breaking after the merge.

In hindsight, this branch should have been rebased against master before merging
the PR.
@theckman theckman added this to the v1.5.0 milestone Oct 12, 2021
@theckman
Copy link
Collaborator Author

@stmcallister I could use your 👀 on this PR so I can merge it as a fast-follow.

Copy link
Contributor

@stmcallister stmcallister left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing it!

@theckman theckman merged commit 7a1cc59 into master Oct 12, 2021
@theckman theckman deleted the hotfix_after_merge branch October 12, 2021 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants