get rid of merge error markers

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

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();
  }

  @Override
  protected void execute() {
  }

  @Override
  protected boolean isFinished() {
    return false;
  }

  @Override
  protected void end() {
  }

  @Override
  protected void interrupted() {
  }
}