projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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 42f439b0390bf21e5cdba30920d2eb607c176a8d..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
}