Fix conflict in Shooter

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index 445584a483dd28273cae08d3719e79e2be4e8d92..820bc6a85c25f2429f5cf9c90153d48475914190 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -177,20 +177,4 @@ public class Shooter extends Subsystem {
     }
     return false;
   }
-
-  public Value getPistonValue() {
-    return piston.get();
-  }
-
-  public void setHighGear() {
-    changeGear(Constants.Shooter.HIGH_GEAR);
-  }
-
-  public void setLowGear() {
-    changeGear(Constants.Shooter.LOW_GEAR);
-  }
-
-  private void changeGear(DoubleSolenoid.Value gear) {
-    piston.set(gear);
-  }
 }