merge conflict resolved
Showing
- modules/build.sh 0 additions, 0 deletionsmodules/build.sh
- modules/catkin_ws/src/CMakeLists.txt 1 addition, 1 deletionmodules/catkin_ws/src/CMakeLists.txt
- modules/catkin_ws/src/car/CMakeLists.txt 21 additions, 11 deletionsmodules/catkin_ws/src/car/CMakeLists.txt
- modules/catkin_ws/src/car/include/mainNode/PlatoonController.h 7 additions, 0 deletions...es/catkin_ws/src/car/include/mainNode/PlatoonController.h
- modules/catkin_ws/src/car/include/mainNode/mainNode.h 17 additions, 17 deletionsmodules/catkin_ws/src/car/include/mainNode/mainNode.h
- modules/catkin_ws/src/car/include/mavLink/mavLink.h 35 additions, 0 deletionsmodules/catkin_ws/src/car/include/mavLink/mavLink.h
- modules/catkin_ws/src/car/launch/fullstart.launch 1 addition, 0 deletionsmodules/catkin_ws/src/car/launch/fullstart.launch
- modules/catkin_ws/src/car/plugins/nodelet_plugins.xml 10 additions, 0 deletionsmodules/catkin_ws/src/car/plugins/nodelet_plugins.xml
- modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp 7 additions, 0 deletionsmodules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp
- modules/catkin_ws/src/car/src/mainNode/mainNode.cpp 22 additions, 9 deletionsmodules/catkin_ws/src/car/src/mainNode/mainNode.cpp
- modules/catkin_ws/src/car/src/mavLink/mavLink.cpp 50 additions, 0 deletionsmodules/catkin_ws/src/car/src/mavLink/mavLink.cpp
Please register or sign in to comment