Merge branch 'add-shooter' of https://github.com/Team4388/RiseOfRidgebotics2020 into add-shooter

This commit is contained in:
ryan123rudder
2020-02-29 18:43:38 -07:00
3 changed files with 3 additions and 5 deletions
@@ -205,8 +205,6 @@ public class RobotContainer {
new JoystickButton(getOperatorJoystick(), XboxController.START_BUTTON)
.whileHeld(new CalibrateShooter(m_robotShooter, m_robotShooterAim));
}
/**