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.

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

Fix merge conflict #2510

Merged
merged 1 commit into from
Aug 26, 2022
Merged

Fix merge conflict #2510

merged 1 commit into from
Aug 26, 2022

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Aug 26, 2022

found in #2363 (comment)

@oli-obk
Copy link
Contributor Author

oli-obk commented Aug 26, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Aug 26, 2022

📌 Commit fa1e51a has been approved by oli-obk

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Aug 26, 2022

⌛ Testing commit fa1e51a with merge 4ae6874...

@bors
Copy link
Contributor

bors commented Aug 26, 2022

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 4ae6874 to master...

@bors bors merged commit 4ae6874 into rust-lang:master Aug 26, 2022
@oli-obk oli-obk deleted the merge_conflict branch October 4, 2022 13:45
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.

2 participants