fix conflict with prev rebase

Opentrons · Mar 18, 2024 · 0734a0a · 0734a0a
1 parent 2b4d5ff
commit 0734a0a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/include/motor-control/core/tasks/messages.hpp b/include/motor-control/core/tasks/messages.hpp
@@ -15,7 +15,7 @@ using MotionControlTaskMessage = std::variant<
     can::messages::MotorPositionRequest, can::messages::ReadLimitSwitchRequest,
     can::messages::HomeRequest,
     can::messages::UpdateMotorPositionEstimationRequest,
-    can::messages::GetMotorUsageRequest, can::messages::AddSensorMoveRequest>;
+    can::messages::GetMotorUsageRequest, can::messages::MotorStatusRequest, can::messages::AddSensorMoveRequest>;
 
 using MoveGroupTaskMessage =
     std::variant<std::monostate, can::messages::AddLinearMoveRequest,