fix merge conflict #2935
Merged
fix merge conflict #2935
Conversation
This file contains 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
Signed-off-by: Icarus9913 <icaruswu66@qq.com>
Icarus9913
added
pr/ready-review
Icarus9913
requested review from
weizhoublue,
ty-dc and
bzsuni
as code owners
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #2935 +/- ##
==========================================
- Coverage 81.10% 81.05% -0.06%
==========================================
Files 49 49
Lines 5336 5336
==========================================
- Hits 4328 4325 -3
- Misses 852 854 +2
- Partials 156 157 +1
Flags with carried forward coverage won't be shown. Click here to find out more. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: Icarus9913 icaruswu66@qq.com
Which issue(s) this PR fixes:
close #2934