fixed the conflict

vickailiu · May 31, 2018 · f9dd187 · f9dd187
1 parent 8a1fb1c
commit f9dd187
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,7 +111,7 @@ catkin_package(
   INCLUDE_DIRS include
 #  LIBRARIES ur_modern_driver
   CATKIN_DEPENDS hardware_interface controller_manager actionlib control_msgs geometry_msgs roscpp sensor_msgs trajectory_msgs ur_msgs
-#  DEPENDS ur_hardware_interface
+  DEPENDS ur_hardware_interface
 )
 
 ###########

diff --git a/src/ur_ros_wrapper.cpp b/src/ur_ros_wrapper.cpp
@@ -61,10 +61,6 @@
 
 // LK modify
 #include "std_msgs/Float32.h"
-<<<<<<< HEAD
-=======
-#include "emma_commons/DoubleArray.h"
->>>>>>> fbc1e6992d14e096eb72156ab80079a5f90ee88e
 
 class RosWrapper {
 protected: