From ba512cd850d9b62470784c91e7d6b5e2e8635b27 Mon Sep 17 00:00:00 2001
From: wangWking <842749351@qq.com>
Date: Fri, 10 Jun 2022 15:51:53 +0800
Subject: [PATCH] resolve the conflict

---
 mycobot_320/new_mycobot_320/CMakeLists.txt        | 1 -
 mycobot_communication/scripts/mycobot_services.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/mycobot_320/new_mycobot_320/CMakeLists.txt b/mycobot_320/new_mycobot_320/CMakeLists.txt
index 5ca6e35..73640da 100644
--- a/mycobot_320/new_mycobot_320/CMakeLists.txt
+++ b/mycobot_320/new_mycobot_320/CMakeLists.txt
@@ -14,7 +14,6 @@ find_package(catkin REQUIRED COMPONENTS
 
   mycobot_communication
   mycobot_description
-
 )
 
 ## Generate messages in the 'msg' folder
diff --git a/mycobot_communication/scripts/mycobot_services.py b/mycobot_communication/scripts/mycobot_services.py
index 2b97386..a062387 100755
--- a/mycobot_communication/scripts/mycobot_services.py
+++ b/mycobot_communication/scripts/mycobot_services.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python2
- # -*- coding: UTF-8 -*-  
+ 
 import time
 import rospy
 from mycobot_communication.srv import *