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.

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

Revert "Removed merge conflict marker" #58305

Merged
merged 1 commit into from Oct 25, 2022
Merged

Revert "Removed merge conflict marker" #58305

merged 1 commit into from Oct 25, 2022

Conversation

vinila21
Copy link
Contributor

Reverts #58187

@vinila21 vinila21 requested a review from qqfish as a code owner October 25, 2022 17:36
@mihaimaruseac
Copy link
Collaborator

Need to immediately be followed by the revert of the cherrypick

@vinila21 vinila21 merged commit 32bfb01 into r2.9 Oct 25, 2022
@mihaimaruseac mihaimaruseac deleted the revert-58187-r2.9 branch October 25, 2022 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mihaimaruseac mihaimaruseac mihaimaruseac approved these changes

@qqfish qqfish Awaiting requested review from qqfish

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@vinila21 @mihaimaruseac