search

ros-industrial / industrial_core

ROS-Industrial core communication packages (http://wiki.ros.org/industrial_core)
156 stars 181 forks source link

Added missed dependencies #209

Closed ipa-nhg closed 6 years ago

ipa-nhg commented 6 years ago

see https://travis-ci.org/ros-industrial/industrial_core/jobs/414064619#L3473

gavanderhoorn commented 6 years ago

It seems the merge of #205 introduced a merge conflict. Could I ask you to fix that @ipa-nhg?

gavanderhoorn commented 6 years ago

Thanks @ipa-nhg :+1: