fix merge conflicts
authorDavid <david.dobervich@gmail.com>
Fri, 12 Feb 2016 04:50:49 +0000 (20:50 -0800)
committerDavid <david.dobervich@gmail.com>
Fri, 12 Feb 2016 04:50:49 +0000 (20:50 -0800)
commita96fa9265d41f13d4df85b8b4d73ee4d287c630c
tree6a3c4f8861ffbdac29e95c1fc56c6df668a01fe0
parente1107e1e54218d74d842c2c460a24c5a79068433
parentca3f706764e025a548a21c1c2b794f3a4eb63a3d
fix merge conflicts
src/org/usfirst/frc/team3501/robot/Robot.java
src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java