fix compile errors that somehow got into master

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / Robot.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index e022abe6dc897426e9d880d576c334c3acb8a71b..eba25906a875b870673843d3da7bcd71325bcf0f 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -19,6 +19,7 @@ public class Robot extends IterativeRobot {
   public static Scaler scaler;
   public static DefenseArm defenseArm;
   public static IntakeArm intakeArm;
+  public static DefenseArm defenseArm;
 
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   SendableChooser positionChooser;