Fix conflicts in ToggleGear

[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 cf200ebfdd2afcce5d5fc1fa95ee476c25a05cc9..062da20f01a5dd73c36a3dcfcd34f2c227f9a420 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@ -3,6 +3,10 @@ package org.usfirst.frc.team3501.robot.commands.shooter;
 import org.usfirst.frc.team3501.robot.Robot;
 import org.usfirst.frc.team3501.robot.Constants;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
+<<<<<<< HEAD
+=======
+
+>>>>>>> Remove getters for shift pistons
 import edu.wpi.first.wpilibj.Timer;
 import edu.wpi.first.wpilibj.command.Command;
 
@@ -31,7 +35,11 @@ public class RunIndexWheelContinuous extends Command {
 
   @Override
   protected void initialize() {
+<<<<<<< HEAD
     t.start();
+=======
+    t.reset();
+>>>>>>> Remove getters for shift pistons
   }
 
   @Override