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

Resolve merge conflicts #1792

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Resolve merge conflicts #1792

merged 1 commit into from
Jan 10, 2025
+461 −27

Conversation

dnlkoch
Copy link
Member

@dnlkoch dnlkoch commented Jan 10, 2025

This resolves the merge conflicts that occured while merging next to main (see #1790).

Please review @terrestris/devs.

@github-actions GitHub Actions
Copy link

Title Lines Statements Branches Functions
All Coverage: 33%
 33.31% (1206/3620) 20.16% (410/2033) 36.49% (262/718)
only changed Coverage: 32%
 32.32% (1128/3490) 19.97% (399/1997) 36.21% (243/671)

@dnlkoch
Copy link
Member Author

dnlkoch commented Jan 10, 2025

Thanks for the review!

@dnlkoch dnlkoch merged commit 14d5381 into next Jan 10, 2025
1 check passed
@dnlkoch dnlkoch deleted the fix-merge-conflicts branch January 10, 2025 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahennr ahennr ahennr 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
@dnlkoch @ahennr