search

robotology / robots-configuration

Contains robots configuration files
BSD 3-Clause "New" or "Revised" License
14 stars 69 forks source link

Devel ergo cub sn002 #665

Closed pattacini closed 2 months ago

pattacini commented 2 months ago

Updates from ergoCubSN002.

pattacini commented 2 months ago

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 commented 2 months ago

You can drop all the modifications to the 001 folder. I guess the issue arose when editing https://github.com/robotology/robots-configuration/pull/665/commits/465ce9445c6f034c01334b76cc22dbd0f1446a2a

pattacini commented 2 months ago

Conflicts resolved. Awaiting CI before merging.