From 0246d87df76f6f9bc77ba5692422f21a81a9a626 Mon Sep 17 00:00:00 2001 From: Riccardo Musso <riccardo.musso@skywarder.eu> Date: Thu, 21 Jul 2022 11:25:41 +0200 Subject: [PATCH] Forgot last merge conflict --- Modules/CommandPad/commandpad.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Modules/CommandPad/commandpad.cpp b/Modules/CommandPad/commandpad.cpp index d9aba60a..5b7fadd1 100644 --- a/Modules/CommandPad/commandpad.cpp +++ b/Modules/CommandPad/commandpad.cpp @@ -9,10 +9,7 @@ const QMap<QString, uint8_t> CommandPad::systemTMList { { "MAV_LOGGER_ID", 4 }, { "MAV_MAVLINK_STATS", 5 }, { "MAV_TASK_STATS_ID", 6 }, - <<< <<< < HEAD - == == == = // { "MAV_DPL_ID", 7 }, - >>>>>>> master { "MAV_ADA_ID", 8 }, { "MAV_NAS_ID", 9 }, { "MAV_CAN_ID", 10 }, -- GitLab