Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better commands #13

Open
wants to merge 67 commits into
base: main
Choose a base branch
from
Open

Better commands #13

wants to merge 67 commits into from

Conversation

eilonhuppert
Copy link
Contributor

No description provided.

Primo4586 and others added 30 commits September 26, 2024 13:07
:(
…son-2024 into shooterSysid

# Conflicts:
#	src/main/java/frc/robot/RobotContainer.java
#	src/main/java/frc/robot/subsystems/Shooter/ShooterConstants.java
#	src/main/java/frc/robot/subsystems/Shooter/ShooterSubsystem.java
#	src/main/java/frc/robot/subsystems/ShooterArmFolder/ShooterArmSubsystem.java
…-2024-1.0- into integration

# Conflicts:
#	src/main/java/frc/robot/RobotContainer.java
…son-2024 into betterCommands

# Conflicts:
#	src/main/java/frc/robot/Robot.java
#	src/main/java/frc/robot/subsystems/Climb/ClimbConstants.java
…son-2024 into betterCommands

# Conflicts:
#	src/main/java/frc/robot/RobotContainer.java
…son-2024 into betterCommands

# Conflicts:
#	src/main/java/frc/robot/Robot.java
#	src/main/java/frc/robot/subsystems/swerve/CommandSwerveDrivetrain.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants