Fix diverging conflicts, not sure how this happened but it did
authorKevin Zhang <icestormf1@gmail.com>
Sat, 23 Jan 2016 03:35:09 +0000 (19:35 -0800)
committerKevin Zhang <icestormf1@gmail.com>
Sat, 23 Jan 2016 03:35:09 +0000 (19:35 -0800)
commit89dad1e0fb923df053c895423a209d2017d3947c
tree90163bf8ae0d81d241ba5d533242c9b112492816
parent1884c3cf667ee1356e8ca8833f1ff28f39b85b1b
parent6833a887c0fd5e4f988b10d25cfd1aee513e2305
Fix diverging conflicts, not sure how this happened but it did
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java