Merge 10 -> 11 and resolve conflicts #734
Merged
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: Louise Poubel <[email protected]>
* ign_TEST: expect joint_axis_infinite_limits valid * Add missing link6 to test/sdf/joint_axis_*.sdf Signed-off-by: Steve Peters <[email protected]>
Codecov Report
@@ Coverage Diff @@
## sdf11 #734 +/- ##
=======================================
Coverage 88.24% 88.24%
=======================================
Files 73 73
Lines 11014 11014
=======================================
Hits 9719 9719
Misses 1295 1295 Continue to review full report at Codecov.
|
chapulina
approved these changes
Oct 16, 2021
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.
➡️ Forward port
Port
sdf10tosdf11Resolve conflicts between #726 and #727
Branch comparison: sdf11...sdf10
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)