Skip to content

Merge master in develop#5976

Merged
BenjaminDeleze merged 2 commits intodevelopfrom
master
Mar 9, 2023
Merged

Merge master in develop#5976
BenjaminDeleze merged 2 commits intodevelopfrom
master

Conversation

@BenjaminDeleze
Copy link
Copy Markdown

No conflicts

ad-daniel and others added 2 commits March 8, 2023 14:45
* Fix warning

* Update tests/api/controllers/supervisor_get_position_orientation_pose/supervisor_get_position_orientation_pose.c

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>

* Update supervisor_get_position_orientation_pose.c

---------

Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
* fix infinite message

* remove test

* fix cpp
@BenjaminDeleze BenjaminDeleze added the synchronization Synchronization of branches label Mar 9, 2023
@BenjaminDeleze BenjaminDeleze self-assigned this Mar 9, 2023
@BenjaminDeleze BenjaminDeleze requested a review from a team as a code owner March 9, 2023 06:49
Copy link
Copy Markdown
Member

@omichel omichel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@BenjaminDeleze BenjaminDeleze merged commit ffa2cff into develop Mar 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

synchronization Synchronization of branches

Development

Successfully merging this pull request may close these issues.

3 participants