Fixing rebase conflicts

This commit is contained in:
Vicente Monge
2017-05-16 17:30:56 +02:00
committed by Lorenz Meier
parent d69c53827f
commit c85039e413
65 changed files with 4091 additions and 8 deletions

1
.gitignore vendored
View File

@@ -62,6 +62,7 @@ GTAGS
*.creator.user
*.files
*.includes
src/modules/micrortps_bridge/micrortps_agent/
# uavcan firmware
ROMFS/px4fmu_common/uavcan/