Skip to content

Conversation

@GBeauregard
Copy link
Contributor

@GBeauregard GBeauregard commented Feb 6, 2022

…31156).

The merge conflict was with the ClassVar change previously made to the same line.

(cherry picked from commit 77b025b)

Co-authored-by: Gregory Beauregard greg@greg.red

https://bugs.python.org/issue46655

…honGH-31156).

(cherry picked from commit 77b025b)

Co-authored-by: Gregory Beauregard <greg@greg.red>
@gvanrossum gvanrossum merged commit e2eeffe into python:3.10 Feb 7, 2022
@bedevere-bot
Copy link

@gvanrossum: Please replace # with GH- in the commit message next time. Thanks!

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.

6 participants