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

Catch merge conflict annotations #71

Merged
merged 4 commits into from
Nov 21, 2024
Merged

Catch merge conflict annotations #71

merged 4 commits into from
Nov 21, 2024

Conversation

hestonhoffman
Copy link
Contributor

What does this PR do?

Motivation

Release

  • YES, this PR requires a release
  • NO, this PR doesn't need a release

Additional Notes

Release checklist

  • Create zip files for EACH style folder.
  • Attach the zip files when creating a release.

@hestonhoffman hestonhoffman requested a review from a team as a code owner November 21, 2024 18:04
@hestonhoffman hestonhoffman added the DO NOT MERGE Don't merge this yet label Nov 21, 2024
@hestonhoffman hestonhoffman removed the DO NOT MERGE Don't merge this yet label Nov 21, 2024
@hestonhoffman hestonhoffman merged commit 8f94672 into main Nov 21, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kayayarai kayayarai kayayarai approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@hestonhoffman @kayayarai