squirrel-project / squirrel_driver

0 stars 14 forks source link

Interaction merge #174

Closed ipa-nhg closed 6 years ago

ipa-nhg commented 6 years ago

solved merge conflict

Current working version according to https://github.com/squirrel-project/squirrel_driver/pull/159#issuecomment-372259664

@jibweb please confirm that this is the right version

jibweb commented 6 years ago

I just tested on the robot, looks good to me !