fix conflicts

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

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/OpenClaw.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/OpenClaw.java
index bece53bcc91d110519198d792de86dd2a1990feb..c0d351d425d563e45311208d7101df0f21cf4704 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/commands/OpenClaw.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/OpenClaw.java
@@ -2,7 +2,7 @@ package org.usfirst.frc3501.RiceCatRobot.commands;
 
 import edu.wpi.first.wpilibj.command.Command;
 
-import org.usfirst.frc3501.RiceCatRobot.Robot;
+import org.usfirst.frc3501.RiceCatRobot.robot.Robot;
 
 /**
  * Opens claw by reversing solenoids.
@@ -10,28 +10,28 @@ import org.usfirst.frc3501.RiceCatRobot.Robot;
  */
 public class OpenClaw extends Command {
 
-    public OpenClaw() {
-        requires(Robot.claw);
-    }
+  public OpenClaw() {
+    requires(Robot.claw);
+  }
 
-    protected void initialize() {
-        System.out.println("IN INIT OPENCLAW");
-    }
+  protected void initialize() {
+    System.out.println("IN INIT OPENCLAW");
+  }
 
-    protected void execute() {
-        Robot.claw.openClaw();
-        System.out.println("Opening Claw");
-    }
+  protected void execute() {
+    Robot.claw.openClaw();
+    System.out.println("Opening Claw");
+  }
 
-    protected boolean isFinished() {
-        System.out.println("Claw Opened");
-        return Robot.claw.isOpen();
-    }
+  protected boolean isFinished() {
+    System.out.println("Claw Opened");
+    return Robot.claw.isOpen();
+  }
 
-    protected void end() {
+  protected void end() {
 
-    }
+  }
 
-    protected void interrupted() {
-    }
+  protected void interrupted() {
+  }
 }