Skip to content

Commit

Permalink
fix: fix conflict with #181
Browse files Browse the repository at this point in the history
This commit fixes a unhandeled conflict that is created when both #181
and #157 are merged.
  • Loading branch information
rickstaa authored and Marco Boneberger committed Mar 9, 2022
1 parent 47f2dc6 commit 386a256
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion franka_gazebo/launch/panda.launch
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<!-- Robot Customization -->
<arg name="arm_id" default="panda" doc="Name of the panda robot to spawn" />
<arg name="use_gripper" default="true" doc="Should a franka hand be mounted on the flange?" />
<arg name="transmission" default="effort" doc="Transmission type used for arm joints. One of position, velocity, effort." />
<arg name="controller" default=" " doc="Which example controller should be started? (One of {cartesian_impedance,model,force}_example_controller)" />
<arg name="transmission" default="effort" doc="Transmission type used for arm joints. One of position, velocity, effort." />
<arg name="x" default="0" doc="How far forward to place the base of the robot in [m]?" />
<arg name="y" default="0" doc="How far leftwards to place the base of the robot in [m]?" />
<arg name="z" default="0" doc="How far upwards to place the base of the robot in [m]?" />
Expand Down

0 comments on commit 386a256

Please sign in to comment.