From ccab09d9864eb8e75e812d814fa399a260af47b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Vallv=C3=A9=20Navarro?= <jvallve@iri.upc.edu>
Date: Mon, 4 Apr 2022 14:04:18 +0200
Subject: [PATCH] hotfix: missed conflict
---
src/publisher_tf.cpp | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/publisher_tf.cpp b/src/publisher_tf.cpp
index af32b73..044f820 100644
--- a/src/publisher_tf.cpp
+++ b/src/publisher_tf.cpp
@@ -47,13 +47,6 @@ PublisherTf::PublisherTf(const std::string& _unique_name,
T_odom2base_.frame_id_ = odom_frame_id_;
T_odom2base_.child_frame_id_ = base_frame_id_;
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_.header.frame_id = map_frame_id_;
Tmsg_map2odom_.header.stamp = ros::Time::now();
--
GitLab