Update submodule references after resolving merge conflicts

navinkaviyarasu · Jan 20, 2025 · 56076b5 · 56076b5
1 parent 4747de9
commit 56076b5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Tools/simulation/gz b/Tools/simulation/gz
diff --git a/boards/modalai/voxl2/libfc-sensor-api b/boards/modalai/voxl2/libfc-sensor-api
diff --git a/platforms/nuttx/NuttX/nuttx b/platforms/nuttx/NuttX/nuttx
diff --git a/src/drivers/gps/devices b/src/drivers/gps/devices
+18 −12		models/advanced_plane/model.sdf
+0 −15		models/airspeed/model.config
+0 −39		models/airspeed/model.sdf
+0 −11		models/gimbal/model.config
+0 −357		models/gimbal/model.sdf
+4 −2		models/lawnmower/model.sdf
+0 −56		models/quadtailsitter/meshes/body.dae
+0 −160		models/quadtailsitter/meshes/iris_prop_ccw.dae
+0 −160		models/quadtailsitter/meshes/iris_prop_cw.dae
+0 −16		models/quadtailsitter/model.config
+0 −508		models/quadtailsitter/model.sdf
+13 −12		models/rc_cessna/model.sdf
+7 −6		models/standard_vtol/model.sdf
+0 −15		models/tiltrotor/model.config
+0 −942		models/tiltrotor/model.sdf
+ −		models/x500_gimbal/meshes/cgo3_camera_remeshed_v1.stl
+ −		models/x500_gimbal/meshes/cgo3_horizontal_arm_remeshed_v1.stl
+ −		models/x500_gimbal/meshes/cgo3_mount_remeshed_v1.stl
+ −		models/x500_gimbal/meshes/cgo3_vertical_arm_remeshed_v1.stl
+372 −7		models/x500_gimbal/model.sdf
+0 −1		worlds/default.sdf
+0 −16		arch/arm/src/imxrt/Kconfig
+1 −53		arch/arm/src/imxrt/imxrt_flexspi.c
+0 −18		arch/arm/src/imxrt/imxrt_flexspi.h
+0 −1		arch/arm/src/imxrt/imxrt_periphclks.h