merge faield

Signed-off-by: YuxuanLiuTier4Desktop <[email protected]>
tier4 · Dec 11, 2024 · d994c31 · d994c31
1 parent aec9470
commit d994c31
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/common_sensor_launch/launch/spinnaker.launch.py b/common_sensor_launch/launch/spinnaker.launch.py
@@ -67,13 +67,9 @@ def load_composable_node_param(param_path):
                         "camera_info_url"
                     ),
                 },
-<<<<<<< HEAD
                 {
                     "use_image_transport": LaunchConfiguration("use_image_transport")
                 }
-=======
-                {"use_image_tranport": LaunchConfiguration("use_image_tranport")},
->>>>>>> 38605787025d7a216b4e669674a0b8e21d58623b
             ],
             extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
         ),