Skip to content
Snippets Groups Projects
Commit ccab09d9 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

hotfix: missed conflict

parent e0fd772b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 7 deletions
src/publisher_tf.cpp
+ 0
− 7
View file @ ccab09d9
...@@ -47,13 +47,6 @@ PublisherTf::PublisherTf(const std::string& _unique_name, ...@@ -47,13 +47,6 @@ PublisherTf::PublisherTf(const std::string& _unique_name,
T_odom2base_.frame_id_ = odom_frame_id_; T_odom2base_.frame_id_ = odom_frame_id_;
T_odom2base_.child_frame_id_ = base_frame_id_; T_odom2base_.child_frame_id_ = base_frame_id_;
T_odom2base_.stamp_ = ros::Time::now(); T_odom2base_.stamp_ = ros::Time::now();
<<<<<<< HEAD
//T_map2odom_.setIdentity();
//T_map2odom_.frame_id_ = map_frame_id_;
//T_map2odom_.child_frame_id_ = odom_frame_id_;
//T_map2odom_.stamp_ = ros::Time::now();
=======
>>>>>>> devel
Tmsg_map2odom_.child_frame_id = odom_frame_id_; Tmsg_map2odom_.child_frame_id = odom_frame_id_;
Tmsg_map2odom_.header.frame_id = map_frame_id_; Tmsg_map2odom_.header.frame_id = map_frame_id_;
Tmsg_map2odom_.header.stamp = ros::Time::now(); Tmsg_map2odom_.header.stamp = ros::Time::now();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment