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=45ae19efee0860cb2d32beb995cdedc8e1e96990;hp=2c99adc7bd4aa2185aa87fab3fb31b64546bf35b;hb=e74e5e9dbc8136a693c367596e839c91722d11ca;hpb=7b3f27ebc4101105e1d54e1f7ae2f6e3f42fa2a8

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 2c99adc..45ae19e 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
@@ -13,11 +13,9 @@ 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
 
   }