From c5e9e9db1e3df5c458eaa7de336ab0b059f94117 Mon Sep 17 00:00:00 2001
From: rickstaa <rick.staa@outlook.com>
Date: Thu, 25 Nov 2021 22:15:51 +0100
Subject: [PATCH] fix: fix conflict with #181

This commit fixes a unhandeled conflict that is created when both #181
and #157 are merged.
---
 franka_gazebo/launch/panda.launch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/franka_gazebo/launch/panda.launch b/franka_gazebo/launch/panda.launch
index ffd000e0b..4be9d9e07 100644
--- a/franka_gazebo/launch/panda.launch
+++ b/franka_gazebo/launch/panda.launch
@@ -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]?" />