Fix merge conflicts
[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / commands / shooter /
drwxr-xr-x   ..
-rw-r--r-- 598 ChangeShooterSpeed.java
-rw-r--r-- 489 ExtendPunch.java
-rw-r--r-- 491 RetractPunch.java
-rw-r--r-- 587 SetShooterSpeed.java
-rwxr-xr-x 892 Shoot.java
-rw-r--r-- 551 runShooter.java