Team4388/RiseOfRidgebotics2020
1
0
Fork 0
mirror of https://github.com/Team4388/RiseOfRidgebotics2020.git synced 2026-06-09 00:38:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Merge Error

Browse Source
This commit is contained in:
ryan123rudder
2021-04-15 16:57:40 -06:00
parent dee0b71033
commit 78ef2c117c
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/frc4388/robot/RobotContainer.java
-1
View File
@@ -65,7 +65,6 @@ import frc4388.robot.commands.shooter.ShooterVelocityControlPID;
import frc4388.robot.commands.shooter.TrackTarget; import frc4388.robot.commands.shooter.TrackTarget;
import frc4388.robot.commands.shooter.TrimShooter; import frc4388.robot.commands.shooter.TrimShooter;
import frc4388.robot.commands.storage.ManageStorage; import frc4388.robot.commands.storage.ManageStorage;
import frc4388.robot.commands.storage.ManageStorage.StorageMode;
import frc4388.robot.commands.storage.StoragePrep; import frc4388.robot.commands.storage.StoragePrep;
import frc4388.robot.subsystems.Camera; import frc4388.robot.subsystems.Camera;
import frc4388.robot.subsystems.Climber; import frc4388.robot.subsystems.Climber;