add Motor value in constants

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

diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
index a11eee8d34a8ee2bc9eefc0a83b6d074d3c52d56..2c99adc7bd4aa2185aa87fab3fb31b64546bf35b 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
@@ -13,7 +13,11 @@ import edu.wpi.first.wpilibj.command.Command;
 public class StopWinch extends Command {
 
   public StopWinch() {
+<<<<<<< HEAD
+    requires(Robot.getDriveTrain());
+=======
     requires(Robot.getClimber());
+>>>>>>> add Motor value in constants
 
   }
 
@@ -32,7 +36,7 @@ public class StopWinch extends Command {
 
   @Override
   protected void end() {
-    Robot.getClimber().stop();
+    Robot.getDriveTrain().stop();
 
   }