Delete repeat shooter methods

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / commands / shooter / RunIndexWheelContinuous.java

diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
index 377f4aadc16ab55897762f2f3a4f34ca3a96fb12..2a5ccbede9710e1e9ce2a3c711afb5dff2517c67 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@ -54,12 +54,7 @@ public class RunIndexWheelContinuous extends Command {
 
   @Override
   protected boolean isFinished() {
-<<<<<<< 7fe535d58b388a1d87b3728095d8a38786865468
     return false;
-=======
-    // TODO
-    return Robot.getOI().toggleIndexWheel.get();
->>>>>>> Add buttons to OI class
   }
 
 }