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

fhmcgvn

Browse Source
This commit is contained in:
samuel desharnais 2023-02-15 19:55:17 -05:00
parent 9536969fce
commit 409936fe3e
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

@ -8,18 +8,10 @@ import edu.wpi.first.wpilibj.Joystick;
import edu.wpi.first.wpilibj.XboxController; import edu.wpi.first.wpilibj.XboxController;
import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Command;
import edu.wpi.first.wpilibj2.command.Commands; import edu.wpi.first.wpilibj2.command.Commands;
import edu.wpi.first.wpilibj2.command.RunCommand;
<<<<<<< HEAD
import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
import edu.wpi.first.wpilibj2.command.button.JoystickButton; import edu.wpi.first.wpilibj2.command.button.JoystickButton;
import edu.wpi.first.wpilibj2.command.button.Trigger; import edu.wpi.first.wpilibj2.command.button.Trigger;
=======
<<<<<<< HEAD
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
=======
import edu.wpi.first.wpilibj2.command.button.JoystickButton;
>>>>>>> ded3f6018fe8a2c8b719139889c406330ff44003
>>>>>>> f1d0e3b3526aaeeafab0416ba8e92344786ea73c
//subsystems //subsystems
import frc.robot.subsystems.BasePilotable; import frc.robot.subsystems.BasePilotable;
import frc.robot.subsystems.Gratte; import frc.robot.subsystems.Gratte;