Skip to content

Commit

Permalink
Resolve submodule conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@mahimayoga
mahimayoga committed Jan 8, 2025
1 parent ef49f65 commit e21605a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Tools/simulation/gz
Submodule gz updated 13 files
+12 −18 models/advanced_plane/model.sdf
+ − models/gimbal/meshes/cgo3_camera_remeshed_v1.stl
+ − models/gimbal/meshes/cgo3_horizontal_arm_remeshed_v1.stl
+ − models/gimbal/meshes/cgo3_mount_remeshed_v1.stl
+ − models/gimbal/meshes/cgo3_vertical_arm_remeshed_v1.stl
+11 −0 models/gimbal/model.config
+357 −0 models/gimbal/model.sdf
+2 −4 models/lawnmower/model.sdf
+12 −13 models/rc_cessna/model.sdf
+6 −7 models/standard_vtol/model.sdf
+15 −0 models/tiltrotor/model.config
+942 −0 models/tiltrotor/model.sdf
+7 −372 models/x500_gimbal/model.sdf

0 comments on commit e21605a

Please sign in to comment.