Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devel ergo cub sn002 #665

Merged
merged 19 commits into from
Jul 5, 2024
Merged

Conversation

pattacini
Copy link
Member

Updates from ergoCubSN002.

@pattacini pattacini self-assigned this Jul 5, 2024
@pattacini
Copy link
Member Author

Hi @S-Dafarra @GiulioRomualdi

We have some conflicts here that we need to sort out.
In particular the one on ergoCubSN001/extra/applications/xbg.xml.

Can you deal with that?
I'll address the other two.

@S-Dafarra
Copy link
Contributor

You can drop all the modifications to the 001 folder. I guess the issue arose when editing 465ce94

@pattacini
Copy link
Member Author

Conflicts resolved. Awaiting CI before merging.

@pattacini pattacini merged commit ee9d607 into robotology:devel Jul 5, 2024
1 check passed
fils99 pushed a commit to ami-iit/robots-configuration that referenced this pull request Sep 25, 2024
Co-authored-by: Stefano Dafarra <stefano.dafarra@gmail.com>
Co-authored-by: Antonio Consilvio <antonio.consilvio@iit.it>
Co-authored-by: Giulio Romualdi <giulio.romualdi@gmail.com>
Co-authored-by: ergocub <ergocub@iit.it>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants