kenaug74/mycobot_ros
1
0
Fork 0
mirror of https://github.com/elephantrobotics/mycobot_ros.git synced 2026-07-14 09:00:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve the conflict

Browse source
This commit is contained in:
wangWking 2022-06-10 15:51:53 +08:00
parent 25742c2dd6
commit ba512cd850
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mycobot_320/new_mycobot_320/CMakeLists.txt
View file

@ -14,7 +14,6 @@ find_package(catkin REQUIRED COMPONENTS
mycobot_communication mycobot_communication
mycobot_description mycobot_description
) )
## Generate messages in the 'msg' folder ## Generate messages in the 'msg' folder

2
mycobot_communication/scripts/mycobot_services.py
View file

@ -1,5 +1,5 @@
#!/usr/bin/env python2 #!/usr/bin/env python2
# -*- coding: UTF-8 -*-
import time import time
import rospy import rospy
from mycobot_communication.srv import * from mycobot_communication.srv import *