Skip to content

Commit

Permalink
Fix: Resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Steggoo committed Jan 25, 2024
1 parent 0992b03 commit c4f6bf3
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/main/java/frc/robot/subsystems/shooter/ShooterIO.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ public class ShooterIOInputs {

public default void updateInputs(ShooterIOInputs inputs){}

default void setMotorVoltageTL(double voltage) {}
default void setMotorVoltageTR(double voltage) {}
default void setMotorVoltageBL(double voltage) {}
default void setMotorVoltageBR(double voltage) {}


default void setVelocityTL(double rpm) {}
default void setVelocityTR(double rpm) {}
default void setVelocityBL(double rpm) {}
Expand Down

0 comments on commit c4f6bf3

Please sign in to comment.