fix merge conflict due to reuseport change#6730
Merged
alexpyattaev merged 1 commit intoanza-xyz:masterfrom Jun 25, 2025
Merged
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6730 +/- ##
=========================================
- Coverage 83.4% 83.3% -0.1%
=========================================
Files 850 852 +2
Lines 377619 377900 +281
=========================================
+ Hits 315000 315119 +119
- Misses 62619 62781 +162 🚀 New features to boost your workflow:
|
|
@alexpyattaev Thank you for addressing the merge conflict! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
#6542 merge conflicted with #6639
Summary of Changes