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

Fix another semantic conflict #5193

Merged
merged 1 commit into from Mar 3, 2023
Merged

Fix another semantic conflict #5193

merged 1 commit into from Mar 3, 2023

Conversation

michaelpj
Copy link
Contributor

Pre-submit checklist:

  • Branch
    • Tests are provided (if possible)
    • Commit sequence broadly makes sense
    • Key commits have useful messages
    • Changelog fragments have been written (if appropriate)
    • Relevant tickets are mentioned in commit messages
    • Formatting, PNG optimization, etc. are updated
  • PR
    • (For external contributions) Corresponding issue exists and is linked in the description
    • Targeting master unless this is a cherry-pick backport
    • Self-reviewed the diff
    • Useful pull request description
    • Reviewer requested

@michaelpj michaelpj added the No Changelog Required Add this to skip the Changelog Check label Mar 3, 2023
@michaelpj michaelpj enabled auto-merge (squash) March 3, 2023 15:01
@michaelpj michaelpj merged commit bb6e4ff into master Mar 3, 2023
@michaelpj michaelpj deleted the mpj/fix-semantic-again branch March 3, 2023 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
No Changelog Required Add this to skip the Changelog Check
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@michaelpj