# Conflicts: # libraries/AP_SerialManager/AP_SerialManager.cpp # libraries/AP_SerialManager/AP_SerialManager.h