Develop #97
Merged
Develop #97
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
Featuer/tmp branch
XHwind
reviewed
Jul 26, 2021
docs/md_files/contributor.md
Outdated
| - Project and lab supervisor | ||
| - [Linkedin](https://www.linkedin.com/in/jiaqi-ma-17037838/) | ||
| - [Google Scholar](https://scholar.google.com/citations?user=S3cQz1AAAAAJ&hl=en) | ||
| >>>>>>> 232a18fe1724891b03327ab54f14f5849ae11214 |
There was a problem hiding this comment.
Seems that the merge conflicts are not resolved here. (like <<<<<HEAD)
There was a problem hiding this comment.
yes, i fixed it
XHwind
reviewed
Jul 26, 2021
docs/md_files/introduction.md
Outdated
| @@ -1,9 +1,14 @@ | |||
| ## OpenCDA Overview | |||
| Current autonomous driving simulation platforms that support scene rendering and traffic simulation mainly concentrate | |||
| on single-vehicle intelligence, therefore, developing and testing Cooperative Driving Automation applications(e.g., cooperative perception, | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
Seems that merge conflicts are not resolved here~
XHwind
requested changes
Jul 26, 2021
XHwind
approved these changes
Jul 26, 2021
Fix format error of developer tutorial
…to hotfix/itent_fix
Hotfix/intent fix
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.
Documentation and License finalization.