Fix Motoman merges#18
Open
smith-doug wants to merge 12 commits intoros-industrial-attic:kinetic-develfrom
Open
Fix Motoman merges#18smith-doug wants to merge 12 commits intoros-industrial-attic:kinetic-develfrom
smith-doug wants to merge 12 commits intoros-industrial-attic:kinetic-develfrom
Conversation
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
2 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.
This fixes the series of merges done with various Motoman changes. I think they were done in the wrong order, or a conflict was resolved improperly. Functions like Macro/Arcon/Arcoff were accepted and merged, but were removed by a later unrelated merge.