fix conflicts

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

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java
index 720ec4197cc264f14eef7385e39c7e56a16cb3b4..c85ea77d46b5155a66628a2bc9eed17ca6be2aba 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java
@@ -9,28 +9,28 @@ import edu.wpi.first.wpilibj.command.Command;
  */
 public class ToggleClaw extends Command {
 
-    public ToggleClaw() {
+  public ToggleClaw() {
 
-    }
+  }
 
-    protected void initialize() {
-        Robot.claw.toggleOn = !Robot.claw.toggleOn;
-    }
+  protected void initialize() {
+    Robot.claw.toggleOn = !Robot.claw.toggleOn;
+  }
 
-    protected void execute() {
-        if (Robot.claw.toggleOn && Robot.claw.isOpen()) {
-            Robot.claw.closeClaw();
-        }
+  protected void execute() {
+    if (Robot.claw.toggleOn && Robot.claw.isOpen()) {
+      Robot.claw.closeClaw();
     }
+  }
 
-    protected boolean isFinished() {
-        return true;
-    }
+  protected boolean isFinished() {
+    return true;
+  }
 
-    protected void end() {
+  protected void end() {
 
-    }
+  }
 
-    protected void interrupted() {
-    }
+  protected void interrupted() {
+  }
 }