mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-25 05:20:06 +08:00
Fixing rebase conflicts
This commit is contained in:
committed by
Lorenz Meier
parent
d69c53827f
commit
c85039e413
1
.gitignore
vendored
1
.gitignore
vendored
@@ -62,6 +62,7 @@ GTAGS
|
||||
*.creator.user
|
||||
*.files
|
||||
*.includes
|
||||
src/modules/micrortps_bridge/micrortps_agent/
|
||||
|
||||
# uavcan firmware
|
||||
ROMFS/px4fmu_common/uavcan/
|
||||
|
||||
Reference in New Issue
Block a user