Fix conflicts in ToggleGear
authorRohan Rodrigues <rohanrodrigues19@gmail.com>
Thu, 9 Mar 2017 01:11:20 +0000 (17:11 -0800)
committerRohan Rodrigues <rohanrodrigues19@gmail.com>
Thu, 9 Mar 2017 01:11:20 +0000 (17:11 -0800)
commitb6c65122a978685703718a9d0f1d8ee012cbf9c8
tree5941aefbab363cbebaa6711f89637cd2f1fb20be
parent6b2fc22f2340904faee55cf5c84c57f59188f1d9
Fix conflicts in ToggleGear
src/org/usfirst/frc/team3501/robot/commands/driving/ToggleGear.java
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java