fix runwinchcontinuous comments

[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 5631290c2b57306098bccc7a0986977206ee059d..6b8db75cc2c8eee9ccc09bb0572eeec1257c75f9 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,18 +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
+ * This command runs the drive train motors (which runs the winch) continuously
+ * at a specified speed until the button triggering it is released
  *
  * pre-condition: This command must be run by a button in OI. The robot must be
  * attached to the rope.
  *
- * post-condition: Winch motor set to a specified speed.
+ * post-condition: Drive train motors set to a specified speed.
  *
  * @author shivanighanta
  *