Skip to content

Fix baselines from bad merge #47177

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

Merged
merged 1 commit into from
Dec 17, 2021
Merged

Conversation

sandersn
Copy link
Member

Conflict between #47018 and #46824, both of which changed the behaviour of private fields.

Fixes build break.

Conflict between #47018 and #46824, both of which changed the behaviour of private fields.
@typescript-bot typescript-bot added Author: Team For Uncommitted Bug PR for untriaged, rejected, closed or missing bug labels Dec 17, 2021
@sandersn sandersn merged commit 8a5d476 into main Dec 17, 2021
@sandersn sandersn deleted the fix-bad-merge-baselines-17-12-2021 branch December 17, 2021 20:15
mprobst pushed a commit to mprobst/TypeScript that referenced this pull request Jan 10, 2022
Conflict between microsoft#47018 and microsoft#46824, both of which changed the behaviour of private fields.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Author: Team For Uncommitted Bug PR for untriaged, rejected, closed or missing bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants