From d035bc4d7afbc12cab208eb72f5ba341086e4376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Wed, 24 Apr 2024 11:25:46 +0200
Subject: [PATCH] Fix CHANGELOG.rst

---
 control_msgs/CHANGELOG.rst | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/control_msgs/CHANGELOG.rst b/control_msgs/CHANGELOG.rst
index aac7ec3..a203d55 100644
--- a/control_msgs/CHANGELOG.rst
+++ b/control_msgs/CHANGELOG.rst
@@ -11,7 +11,6 @@ Changelog for package control_msgs
 
 4.4.0 (2023-04-28)
 ------------------
-<<<<<<< HEAD
 * Update JTC state message (`#87 <https://github.com/ros-controls/control_msgs/issues/87>`_)
 * Contributors: Christoph Fröhlich
 
@@ -20,11 +19,6 @@ Changelog for package control_msgs
 * Status message for steering controllers (backport `#72 <https://github.com/ros-controls/control_msgs/issues/72>`_) (`#83 <https://github.com/ros-controls/control_msgs/issues/83>`_)
 * Add state message for mechanum controller (backport `#79 <https://github.com/ros-controls/control_msgs/issues/79>`_) (`#82 <https://github.com/ros-controls/control_msgs/issues/82>`_)
 * Contributors: Bence Magyar, Denis Stogl, Giridhar Bukka
-=======
-* Add state message for mechanum controller #79
-* Status message for steering controllers
-* Contributors: Denis Štogl, GiridharBukka, petkovich
->>>>>>> d24165f (Add generic messages for commanding and getting states from controllers. (#69))
 
 4.1.0 (2022-10-19)
 ------------------