Delete copies of methods, and change initialize code in runIntakeContinuous and runRe...

[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 2c99adc7bd4aa2185aa87fab3fb31b64546bf35b..597bd65d18ca44be30885d09d056aee9070f13af 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,12 +13,7 @@ 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
-
   }
 
   @Override