Merge branch '1' of https://github.com/HarryWang163/FRC6494_2026Regional into 1

2026-03-05 20:30:33 +08:00
parent 921a11b31a a8acbce9dc
commit f31b614cc3
4 changed files with 33 additions and 0 deletions
@@ -144,6 +144,11 @@ public class RobotContainer {
    controllerlower.a()
    .onTrue(robotStatusManager.setStatusCommand(RobotStatus.Climbing))
    .onFalse(robotStatusManager.setStatusCommand(RobotStatus.AllTelop));
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> a8acbce9dc302adc52e28e6f8c205677f50ea20e
  }

  private void configueShooter(){