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.

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

fix merge conflict #3733

Merged
merged 1 commit into from
Jul 3, 2024
Merged

fix merge conflict #3733

merged 1 commit into from
Jul 3, 2024

Conversation

zirain
Copy link
Contributor

@zirain zirain commented Jul 3, 2024

No description provided.

Signed-off-by: zirain <[email protected]>
@zirain zirain requested a review from a team as a code owner July 3, 2024 01:04
Copy link

codecov bot commented Jul 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.02%. Comparing base (acce649) to head (1810e4c).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3733      +/-   ##
==========================================
+ Coverage   68.90%   69.02%   +0.12%     
==========================================
  Files         176      176              
  Lines       21610    21688      +78     
==========================================
+ Hits        14891    14971      +80     
+ Misses       5639     5637       -2     
  Partials     1080     1080              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zirain zirain merged commit 4602f6d into envoyproxy:main Jul 3, 2024
13 checks passed
@zirain zirain deleted the fix-gen branch July 3, 2024 01:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants