Skip to content

Commit 399d268

Browse files
authored
Update message_publisher.cpp
fixed merge conflict
1 parent b321c1d commit 399d268

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

vortex_utility_nodes/src/message_publisher.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
<<<<<<< HEAD
21
#include <variant>
3-
=======
42
#include <sensor_msgs/msg/imu.hpp>
5-
>>>>>>> dc9022e340e1d7a4463d4c98418414acf5cd63b6
63
#include <vortex/utils/math.hpp>
74
#include "geometry_msgs/msg/pose_stamped.hpp"
85
#include "geometry_msgs/msg/pose_with_covariance_stamped.hpp"

0 commit comments

Comments
 (0)