Fixed conflict
authorRohan Rodrigues <rohanrodrigues19@gmail.com>
Thu, 9 Mar 2017 00:56:39 +0000 (16:56 -0800)
committerRohan Rodrigues <rohanrodrigues19@gmail.com>
Thu, 9 Mar 2017 00:56:39 +0000 (16:56 -0800)
commitb092ede21d02f15a37d04916df1a6eabd5940213
tree3a144c71e0b3102ca50e94270a7ed00994d97238
parent2e70084e487a31fb7d2d8f3adc9d56701ba144ea
Fixed conflict
src/org/usfirst/frc/team3501/robot/Constants.java
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java