fix conflicts

[3501/2015-FRC-Spark] / src / org / usfirst / frc3501 / RiceCatRobot / commands / OpenClaw.java

package org.usfirst.frc3501.RiceCatRobot.commands;

import edu.wpi.first.wpilibj.command.Command;

import org.usfirst.frc3501.RiceCatRobot.robot.Robot;

/**
 * Opens claw by reversing solenoids.
 *
 */
public class OpenClaw extends Command {

  public OpenClaw() {
    requires(Robot.claw);
  }

  protected void initialize() {
    System.out.println("IN INIT OPENCLAW");
  }

  protected void execute() {
    Robot.claw.openClaw();
    System.out.println("Opening Claw");
  }

  protected boolean isFinished() {
    System.out.println("Claw Opened");
    return Robot.claw.isOpen();
  }

  protected void end() {

  }

  protected void interrupted() {
  }
}