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

Move changelog entry for #1996. #2054

Merged
merged 1 commit into from
Dec 16, 2021
Merged

Conversation

aganders3
Copy link
Contributor

I think this may have just been a merge conflict I didn't resolve correctly in #1996. Sorry!

Copy link
Member

@davidhewitt davidhewitt left a comment

Choose a reason for hiding this comment

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

No worries, I've done the same. Thanks for fixing!

@davidhewitt davidhewitt merged commit 777a607 into PyO3:main Dec 16, 2021
@aganders3 aganders3 deleted the fix-changelog branch December 16, 2021 21:27
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.

2 participants