X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fcommands%2Fclimber%2FStopWinch.java;h=2c99adc7bd4aa2185aa87fab3fb31b64546bf35b;hp=42f439b0390bf21e5cdba30920d2eb607c176a8d;hb=7b3f27ebc4101105e1d54e1f7ae2f6e3f42fa2a8;hpb=ac25505b36b679df7b208cfdfc9177a2f27f4c36

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 42f439b..2c99adc 100644
--- 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
 
   }