Fix merging errors with climber subclass
authorshainachen <shaina.sierra@gmail.com>
Sun, 22 Jan 2017 01:00:10 +0000 (17:00 -0800)
committerArunima DIvya <adivya822@student.fuhsd.org>
Thu, 26 Jan 2017 04:28:03 +0000 (20:28 -0800)
commitd0a3a99e6e2e593b189cea7842eee444153fc8e9
tree181821f7956bad6370d31e2d9c45cf17e8645ae7
parentadfc017150276503ef41671f801b65e642caa9cf
Fix merging errors with climber subclass
src/org/usfirst/frc/team3501/robot/Constants.java
src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java