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

Fixed Bad Merge #4740

Merged
merged 1 commit into from
Aug 28, 2024
Merged

Conversation

IllianiCBT
Copy link
Collaborator

Merge of previous fix got overwritten during conflict resolution. Code is identical to previous approved PR.

Merge of previous fix got overwritten during conflict resolution. Code is identical to previous approved PR.
@IllianiCBT IllianiCBT merged commit a41468a into MegaMek:master Aug 28, 2024
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 10.81%. Comparing base (f040350) to head (664fb04).
Report is 4 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff              @@
##             master    #4740      +/-   ##
============================================
+ Coverage     10.66%   10.81%   +0.15%     
- Complexity     5704     5715      +11     
============================================
  Files           950      950              
  Lines        131295   131279      -16     
  Branches      19138    19137       -1     
============================================
+ Hits          13997    14194     +197     
+ Misses       116075   115858     -217     
- Partials       1223     1227       +4     

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

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.

2 participants