KEMBAR78

Fix a minor merge conflict caused by #19118. by tyralla · Pull Request #19246 · python/mypy · GitHub

Fix a minor merge conflict caused by #19118. #19246

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

Merged

hauntsaninja merged 1 commit into python:master from tyralla:fix/merge_conflict

Jun 6, 2025

Collaborator

tyralla commented Jun 6, 2025

No description provided.


          Fix a minor merge conflict caused by python#19118.

1b54b9c

sterliakov approved these changes

View reviewed changes

hauntsaninja approved these changes

View reviewed changes

hauntsaninja merged commit a573a40 into python:master

13 checks passed

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

Labels

None yet