Fix merge conflicts
authorniyatisriram <niyatisriram@gmail.com>
Wed, 17 Feb 2016 21:01:46 +0000 (13:01 -0800)
committerniyatisriram <niyatisriram@gmail.com>
Wed, 17 Feb 2016 21:01:46 +0000 (13:01 -0800)
commit68e554b243aad0de65f60658ff21ec893119d526
tree48d3b0b518bf597ae116921c20a805c487d91087
parentc63ba9b9649deb7b4441f318a578c638cb26ebb9
parent95f05eb0afbbdf719de43f579b6d69e1758b1d3c
Fix merge conflicts
src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java