Fix merge conflicts
authorRohan Rodrigues <rohanrodrigues19@gmail.com>
Thu, 9 Mar 2017 01:10:05 +0000 (17:10 -0800)
committerRohan Rodrigues <rohanrodrigues19@gmail.com>
Thu, 9 Mar 2017 01:10:05 +0000 (17:10 -0800)
commit6b2fc22f2340904faee55cf5c84c57f59188f1d9
tree6bd2b2206df1f09ed95182f1e1dc03b27120da3c
parentfe04fc8e547ee347079730ca38e1a529f870b00c
Fix merge conflicts
src/org/usfirst/frc/team3501/robot/OI.java
src/org/usfirst/frc/team3501/robot/commands/driving/ToggleDrivePiston.java [deleted file]
src/org/usfirst/frc/team3501/robot/commands/driving/ToggleGear.java
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java