# Conflicts: # ArduCopter/AP_Arming.cpp # ArduCopter/AP_Arming.h # ArduCopter/Parameters.cpp # ArduCopter/version.h # Tools/scripts/build_autotest.sh # libraries/AP_Logger/AP_Logger.cpp # libraries/AP_UAVCAN/AP_UAVCAN.cpp # libraries/AP_UAVCAN/AP_UAVCAN_Server.cpp # libraries/GCS_MAVLink/GCS_Common.cpp