Humble devel #87
Open
Humble devel #87
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
…cl_3dl_parameters update parameters for mcl_3dl
Develop/add rfans16
…s_laserscan add rfans laserscan
…cl_3dl_parameter レビューしたのでマージします
… into humble-devel
add urg with mirror
|
プルリクにあまり詳しくないので，誰か確認をお願いします |
|
まずはコンフリクト（ブランチを分けた後に両方のブランチで修正している）が発生しているので，そちらを統合する必要がありそうです．詳しくは見ていませんが，おそらく実行できない状態になっていると思います． |
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.
No description provided.