Merge 2023 engineer rm control. #200
Closed
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
# Conflicts: # rm_msgs/CMakeLists.txt # rm_referee/src/referee_base.cpp
✅ Deploy Preview for rm-control ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
cc0h
requested review from
ljq-lv,
L-SY,
ye-luo-xi-tui,
d0h0s,
chenhuiYu00,
1moule and
liyixin135
1moule
reviewed
Oct 19, 2023
rm_referee/src/ui/time_change_ui.cpp
Outdated
| @@ -4,6 +4,7 @@ | |||
|
|
|||
| #include "rm_referee/ui/time_change_ui.h" | |||
|
|
|||
| class ConstPtr; | |||
There was a problem hiding this comment.
这行应该是merge的时候加进来的，没有注意到。
There was a problem hiding this comment.
这行应该是merge的时候加进来的，没有注意到。
速速删除
|
pr标题跟描述可以改改，我看着就是在改ui，然后hw那个应该可以另开一个pr |
hw只加了一句，就没想单独开一个pr，而且工程之前太多commit没pr，搞起来怪麻烦的 |
Merged
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.
Merge 2023 engineer ui codes.Add can lose error in rm_hw.