get rid of merge error markers

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index ac4e2fac8ad27ec6dac8e78dc41c567ba3d58275..2a26c73e0e459314f46ed5770ad2ad6a0f66fe5c 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -26,18 +26,16 @@ public class Robot extends IterativeRobot {
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   SendableChooser positionChooser;
   SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
-  positionFourDefense, positionFiveDefense;
+      positionFourDefense, positionFiveDefense;
 
   // Gyro stuff
   public GyroLib gyro;
->>>>>>> Remove useless variables and commented stuff in Robot.java
 
   @Override
   public void robotInit() {
     driveTrain = new DriveTrain();
     oi = new OI();
     gyro = new GyroLib(I2C.Port.kOnboard, false);
->>>>>>> Remove useless variables and commented stuff in Robot.java
 
     shooter = new Shooter();
     scaler = new Scaler();
@@ -48,9 +46,6 @@ public class Robot extends IterativeRobot {
     addPositionChooserOptions();
     addDefensesToAllDefenseSendableChoosers();
     sendSendableChoosersToSmartDashboard();
-
-=======
->>>>>>> Remove useless variables and commented stuff in Robot.java
   }
 
   private void initializeSendableChoosers() {

diff --git a/src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java b/src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java
index 987131d90ee44d12950c58b524c6ea0ee8c054bb..31416fecc8f1274c6933158ac8ddaa0d830c1373 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java
@@ -1,34 +1,33 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.robot.Robot;
+
 import edu.wpi.first.wpilibj.command.Command;
 
 public class AimAndAlign extends Command {
 
-       public AimAndAlign() {
-       }
-
-       @Override
-       protected void initialize() {
-               Robot.intakeArm.getArmAngle();
-       }
+  public AimAndAlign() {
+  }
 
-       @Override
-       protected void execute() {
-               if (Robot.intakeArm.getArmVoltage() == 1) {
+  @Override
+  protected void initialize() {
+    Robot.intakeArm.getArmAngle();
+  }
 
-               }
-       }
+  @Override
+  protected void execute() {
+  }
 
-       @Override
-       protected boolean isFinished() {
-               return false;
-       }
+  @Override
+  protected boolean isFinished() {
+    return false;
+  }
 
-       @Override
-       protected void end() {
-       }
+  @Override
+  protected void end() {
+  }
 
-       @Override
-       protected void interrupted() {
-       }
+  @Override
+  protected void interrupted() {
+  }
 }