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 a3e6f3f2d06afdcb881cf1b69cc2eaac152b4ad1..8a76664f9cd381479e9f318a254e11148fa9abbb 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,6 +5,7 @@ import org.usfirst.frc.team3501.robot.Robot;
 import edu.wpi.first.wpilibj.command.Command;
 
 /**
+<<<<<<< HEAD
  * <<<<<<< HEAD <<<<<<< 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
@@ -20,6 +21,15 @@ import edu.wpi.first.wpilibj.command.Command;
  * runs the drive train. >>>>>>> Delete StopWinch and Climber subsystem, edit
  * javadoc comments >>>>>>> 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
+>>>>>>> Fix merging errors with climber subclass
  *
  * pre-condition: This command must be run by a button in OI. The robot must be
  * attached to the rope.