Closed HPovoa closed 6 years ago
please solve the merge conflict:
roscd squirrel_interaction
git pull https://github.com/squirrel-project/squirrel_driver
git mergetool
@bajo @HPovoa please merge this with the robot version together, test on the robot and update this pull request
@ipa-nhg Tested on the robot. Works fine. Ready to merge from our side.
Some of these changes should fix concurrency issues and make the code a lot more stable.