Fix merging errors with climber subclass

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / commands / climber / RunWinchContinuous.java

diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
index a713cb2a1a8c7d7bcf1f7bc4192f35bb92babecf..5631290c2b57306098bccc7a0986977206ee059d 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
@@ -5,14 +5,13 @@ import org.usfirst.frc.team3501.robot.Robot;
 import edu.wpi.first.wpilibj.command.Command;
 
 /**
-<<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66
- * This command runs the winch motor continuously at a specified speed until the
- * button triggering it is released. This command also makes the drive train
- * motors run because the winch is controlled by the drive train.
-=======
- * This command will run the winch motor continuously until the button
- * triggering it is released. This command also runs the drive train.
->>>>>>> Delete StopWinch and Climber subsystem, edit javadoc comments
+ * <<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66 This command runs the winch
+ * motor continuously at a specified speed until the button triggering it is
+ * released. This command also makes the drive train motors run because the
+ * winch is controlled by the drive train. ======= This command will run the
+ * winch motor continuously until the button triggering it is released. This
+ * command also runs the drive train. >>>>>>> Delete StopWinch and Climber
+ * subsystem, edit javadoc comments
  *
  * pre-condition: This command must be run by a button in OI. The robot must be
  * attached to the rope.
@@ -39,10 +38,6 @@ public class RunWinchContinuous extends Command {
   @Override
   protected void initialize() {
     Robot.getDriveTrain().setMotorValues(motorVal, motorVal);
-<<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66
-=======
-
->>>>>>> Delete StopWinch and Climber subsystem, edit javadoc comments
   }
 
   @Override