Update package maintainers (#1203)

This commit updates the package maintainers as the project's governance has changed a bit.

(cherry picked from commit 0f80235)

# Conflicts:
#	ur/package.xml
#	ur_calibration/package.xml
#	ur_controllers/package.xml
#	ur_dashboard_msgs/package.xml
#	ur_moveit_config/package.xml
#	ur_robot_driver/package.xml

Author: urfeex

ur/package.xml

@@ -4,8 +4,14 @@
   <name>ur</name>
   <version>2.2.16</version>
   <description>Metapackage for universal robots</description>
+<<<<<<< HEAD
   <maintainer email="[email protected]">Felix Exner</maintainer>
   <maintainer email="[email protected]">Robert Wilbrandt</maintainer>
+=======
+  <maintainer email="[email protected]">Felix Exner</maintainer>
+  <maintainer email="[email protected]">Rune Søe-Knudsen</maintainer>
+  <maintainer email="[email protected]">Universal Robots A/S</maintainer>
+>>>>>>> 0f80235 (Update package maintainers (#1203))
   <license>BSD-3-Clause</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>

ur_calibration/package.xml

@@ -4,8 +4,14 @@
   <version>2.2.16</version>
   <description>Package for extracting the factory calibration from a UR robot and change it such that it can be used by ur_description to gain a correct URDF</description>
 
+<<<<<<< HEAD
   <maintainer email="[email protected]">Felix Exner</maintainer>
   <maintainer email="[email protected]">Robert Wilbrandt</maintainer>
+=======
+  <maintainer email="[email protected]">Felix Exner</maintainer>
+  <maintainer email="[email protected]">Rune Søe-Knudsen</maintainer>
+  <maintainer email="[email protected]">Universal Robots A/S</maintainer>
+>>>>>>> 0f80235 (Update package maintainers (#1203))
 
   <license>BSD-3-Clause</license>
 

ur_controllers/package.xml

@@ -5,9 +5,15 @@
   <version>2.2.16</version>
   <description>Provides controllers that use the speed scaling interface of Universal Robots.</description>
 
+<<<<<<< HEAD
   <maintainer email="[email protected]">Denis Stogl</maintainer>
   <maintainer email="[email protected]">Felix Exner</maintainer>
   <maintainer email="[email protected]">Robert Wilbrandt</maintainer>
+=======
+  <maintainer email="[email protected]">Felix Exner</maintainer>
+  <maintainer email="[email protected]">Rune Søe-Knudsen</maintainer>
+  <maintainer email="[email protected]">Universal Robots A/S</maintainer>
+>>>>>>> 0f80235 (Update package maintainers (#1203))
 
   <license>BSD-3-Clause</license>
 
@@ -17,6 +23,7 @@
   <author email="[email protected]">Marvin Große Besselmann</author>
   <author email="[email protected]">Lovro Ivanov</author>
   <author email="[email protected]">Andy Zelenak</author>
+  <author email="[email protected]">Vincenzo Di Pentima</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 

ur_dashboard_msgs/package.xml

@@ -5,8 +5,14 @@
   <version>2.2.16</version>
   <description>Messages around the UR Dashboard server.</description>
 
+<<<<<<< HEAD
   <maintainer email="[email protected]">Felix Exner</maintainer>
   <maintainer email="[email protected]">Robert Wilbrandt</maintainer>
+=======
+  <maintainer email="[email protected]">Felix Exner</maintainer>
+  <maintainer email="[email protected]">Rune Søe-Knudsen</maintainer>
+  <maintainer email="[email protected]">Universal Robots A/S</maintainer>
+>>>>>>> 0f80235 (Update package maintainers (#1203))
 
   <license>BSD-3-Clause</license>
 

ur_moveit_config/package.xml

@@ -6,14 +6,21 @@
   <description>
      An example package with MoveIt2 configurations for UR robots.
   </description>
+<<<<<<< HEAD
   <maintainer email="[email protected]">Denis Stogl</maintainer>
   <maintainer email="[email protected]">Felix Exner</maintainer>
   <maintainer email="[email protected]">Robert Wilbrandt</maintainer>
+=======
+  <maintainer email="[email protected]">Felix Exner</maintainer>
+  <maintainer email="[email protected]">Rune Søe-Knudsen</maintainer>
+  <maintainer email="[email protected]">Universal Robots A/S</maintainer>
+>>>>>>> 0f80235 (Update package maintainers (#1203))
 
   <license>Apache2.0</license>
 
   <author email="[email protected]">Lovro Ivanov</author>
   <author email="[email protected]">Andy Zelenak</author>
+  <author email="[email protected]">Vincenzo Di Pentima</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>

ur_robot_driver/package.xml

@@ -5,9 +5,15 @@
   <version>2.2.16</version>
   <description>The new driver for Universal Robots UR3, UR5 and UR10 robots with CB3 controllers and the e-series.</description>
 
+<<<<<<< HEAD
   <maintainer email="[email protected]">Denis Stogl</maintainer>
   <maintainer email="[email protected]">Felix Exner</maintainer>
   <maintainer email="[email protected]">Robert Wilbrandt</maintainer>
+=======
+  <maintainer email="[email protected]">Felix Exner</maintainer>
+  <maintainer email="[email protected]">Rune Søe-Knudsen</maintainer>
+  <maintainer email="[email protected]">Universal Robots A/S</maintainer>
+>>>>>>> 0f80235 (Update package maintainers (#1203))
 
   <license>BSD-3-Clause</license>
 
@@ -17,6 +23,7 @@
   <author email="[email protected]">Marvin Große Besselmann</author>
   <author email="[email protected]">Lovro Ivanov</author>
   <author email="[email protected]">Andy Zelenak</author>
+  <author email="[email protected]">Vincenzo Di Pentima</author>
   <author>Thomas Timm Andersen</author>
   <author>Simon Rasmussen</author>
   <author>Felix Exner</author>