fixed merge conflict for setRollerVoltage method
authorShaina Chen <shaina.sierra@gmail.com>
Fri, 5 Feb 2016 03:23:29 +0000 (19:23 -0800)
committerShaina Chen <shaina.sierra@gmail.com>
Fri, 5 Feb 2016 04:21:36 +0000 (20:21 -0800)
commit6d1021d82076279db052cb18229148988ac548d3
tree6ceebd0d9d9e2055f71419a7aaaa61561b118482
parentc8c4e6d972c4173cfe2461d1b313e02211ac28e1
fixed merge conflict for setRollerVoltage method
src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java