Skip to content

Update baseline after out-of-order merge #50320

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
Aug 16, 2022

Conversation

andrewbranch
Copy link
Member

A baseline conflict from merging #50029 and #49884 at approximately the same time.

@typescript-bot typescript-bot added Author: Team For Uncommitted Bug PR for untriaged, rejected, closed or missing bug labels Aug 16, 2022
@andrewbranch andrewbranch merged commit 90fa1c7 into microsoft:main Aug 16, 2022
@andrewbranch andrewbranch deleted the fix-baseline branch August 16, 2022 15:55
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