Fix conflicts from rebase
authorArunima DIvya <adivya822@student.fuhsd.org>
Fri, 3 Feb 2017 03:38:42 +0000 (19:38 -0800)
committerArunima DIvya <adivya822@student.fuhsd.org>
Fri, 3 Feb 2017 03:38:42 +0000 (19:38 -0800)
commit3391456c20bc7fdae604f0a30a4506da0a628a77
tree4187daf1ba556692559851cd425ec5aee00a543d
parent06415bd82ca9e1fb7c7508b50953b7bea926b2e2
Fix conflicts from rebase
src/org/usfirst/frc/team3501/robot/commands/driving/DriveDistance.java
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java