projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Delete StopWinch and Climber subsystem, edit javadoc comments
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
commands
/
climber
/
RunWinch.java
diff --git
a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
index 88195a4b2d89227fffaa90ea3bf2ede0cbda4572..bed5c8ca0bda9efa108d8840a12a0d64432bb885 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
+++ b/
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
@@
-61,6
+61,10
@@
public class RunWinch extends Command {
@Override
protected void end() {
Robot.getDriveTrain().stop();
+<<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66
+=======
+
+>>>>>>> Delete StopWinch and Climber subsystem, edit javadoc comments
}
@Override