From: Rohan Rodrigues <rohanrodrigues19@gmail.com>
Date: Thu, 9 Mar 2017 00:58:12 +0000 (-0800)
Subject: Fix conflict in Shooter
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=d5498c9f699d654fbb0bf00ddcd837eea8bcc78e

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 445584a..820bc6a 100644
--- 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);
-  }
 }