PLS5618/betabot-2023
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

h

Browse Source
This commit is contained in:
Antoine PerreaultE 2022-11-23 19:45:44 -05:00
parent 9e78c089be
commit 869bfef8ba
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/frc/robot/RobotContainer.java
View File

@ -20,21 +20,13 @@ import frc.robot.subsystems.Pistonshaker;
// commands // commands
import frc.robot.commands.Activer_poussoir; import frc.robot.commands.Activer_poussoir;
import frc.robot.commands.ActiverBlockeur; import frc.robot.commands.ActiverBlockeur;
<<<<<<< HEAD
import frc.robot.commands.Activer_poussoir;
=======
<<<<<<< HEAD
import frc.robot.commands.DesactiverBlockeur; import frc.robot.commands.DesactiverBlockeur;
import frc.robot.commands.Reculer; import frc.robot.commands.Reculer;
import frc.robot.commands.TournerDroite; import frc.robot.commands.TournerDroite;
import frc.robot.commands.TournerGauche; import frc.robot.commands.TournerGauche;
import frc.robot.commands.Activershaker; import frc.robot.commands.Activershaker;
import frc.robot.commands.Avancer; import frc.robot.commands.Avancer;
=======
>>>>>>> db39b5c3db06eed46b45655b80bb22a24e971bb2
import frc.robot.commands.Activershaker;
import frc.robot.commands.DesactiverBlockeur;
>>>>>>> 3d2fed7d28e2c16a03399281bc03d1cf3df4f6d1