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 build conflict issues #2230

Merged
merged 1 commit into from
Sep 20, 2024
Merged

fix build conflict issues #2230

merged 1 commit into from
Sep 20, 2024

Conversation

meisnate12
Copy link
Member

Description

Fixes the issue of build conflicts when merging branches

Type of Change

Please delete options that are not relevant.

  • Infrastructure change (changes related to the github repo, build process, or the like)

@meisnate12 meisnate12 merged commit 17f31e8 into nightly Sep 20, 2024
5 checks passed
@meisnate12 meisnate12 deleted the fix-build-conflicts branch September 20, 2024 17:18
kometa-tokens bot pushed a commit that referenced this pull request Sep 20, 2024
@meisnate12 @actions-user
[39] fix build conflict issues (#2230)
7abc3d3
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@meisnate12