Fix merging errors with climber subclass
authorshainachen <shaina.sierra@gmail.com>
Sun, 22 Jan 2017 01:00:10 +0000 (17:00 -0800)
committerCindy Zhang <cindyzyx9@gmail.com>
Wed, 25 Jan 2017 03:40:39 +0000 (19:40 -0800)
commit9d7d66765de9d108577d048de721fb3557c4495a
tree2e94c90c66ccb6a1300853aaebf72c27696b2842
parentd175e83e2bd58c3c0956ca1c28a88ccd5046f656
Fix merging errors with climber subclass
src/org/usfirst/frc/team3501/robot/Constants.java
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java