Skip to content
This repository has been archived by the owner on Dec 13, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into merge-v2.5-to-main
Browse files Browse the repository at this point in the history
  • Loading branch information
Erik Holum committed Aug 9, 2023
2 parents 2d66866 + 7428fda commit 1a55d0a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/picknik_ur_base_config/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>picknik_ur_base_config</name>
<version>2.5.0</version>
<version>2.6.0</version>

<description>Base configuration package for Picknik's UR robot arms</description>

Expand Down
2 changes: 1 addition & 1 deletion src/picknik_ur_gazebo_config/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>picknik_ur_gazebo_config</name>
<version>2.5.0</version>
<version>2.6.0</version>

<description>Site configuration package for the UR5e in PickNik's space station world simulated by Gazebo.</description>

Expand Down
2 changes: 1 addition & 1 deletion src/picknik_ur_mock_hw_config/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>picknik_ur_mock_hw_config</name>
<version>2.5.0</version>
<version>2.6.0</version>

<description>Configuration package for a UR arm that can be simulated with mock hardware</description>

Expand Down
2 changes: 1 addition & 1 deletion src/picknik_ur_site_config/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>picknik_ur_site_config</name>
<version>2.5.0</version>
<version>2.6.0</version>

<description>Site configuration package for a UR arm that can be simulated with mock hardware</description>

Expand Down

0 comments on commit 1a55d0a

Please sign in to comment.