Fix rebase conflicts, by delete shifter instance
authorArunima DIvya <adivya822@student.fuhsd.org>
Tue, 31 Jan 2017 03:20:45 +0000 (19:20 -0800)
committerArunima DIvya <adivya822@student.fuhsd.org>
Fri, 3 Feb 2017 03:23:38 +0000 (19:23 -0800)
commita4e99721c66bf58635eae0a089ddb26c1c237c07
tree97a94cd8f9e0bf7195bed483a3c58134bf7bf139
parentaf4491f7041a4659d6624d5e8b5cb4ae233d1a2b
Fix rebase conflicts, by delete shifter instance
src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java