1

2026-03-05 20:44:11 +08:00
parent f31b614cc3
commit 7cee19994f
5 changed files with 3 additions and 48 deletions
@@ -144,11 +144,6 @@ public class RobotContainer {
    controllerlower.a()
    .onTrue(robotStatusManager.setStatusCommand(RobotStatus.Climbing))
    .onFalse(robotStatusManager.setStatusCommand(RobotStatus.AllTelop));
-<<<<<<< HEAD
-=======
-
-
->>>>>>> a8acbce9dc302adc52e28e6f8c205677f50ea20e
  }

  private void configueShooter(){