fix conflicts

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

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java
index eb413542defce1109b4f129fe79921cb2c3995fc..3669eaf88568d30fa87f176ec30ec53b13e071f4 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java
@@ -9,35 +9,35 @@ import edu.wpi.first.wpilibj.command.Command;
  */
 public class ToggleCompressor extends Command {
 
-    public ToggleCompressor() {
+  public ToggleCompressor() {
+  }
+
+  // Called just before this Command runs the first time
+  protected void initialize() {
+  }
+
+  // Called repeatedly when this Command is scheduled to run
+  protected void execute() {
+    if (Robot.compressor.enabled()) {
+      Robot.compressor.stop();
+    } else {
+      Robot.compressor.start();
     }
 
-    // Called just before this Command runs the first time
-    protected void initialize() {
-    }
-
-    // Called repeatedly when this Command is scheduled to run
-    protected void execute() {
-        if (Robot.compressor.enabled()) {
-            Robot.compressor.stop();
-        } else {
-            Robot.compressor.start();
-        }
+  }
 
-    }
+  // Make this return true when this Command no longer needs to run execute()
+  protected boolean isFinished() {
+    return true;
+  }
 
-    // Make this return true when this Command no longer needs to run execute()
-    protected boolean isFinished() {
-        return true;
-    }
+  // Called once after isFinished returns true
+  protected void end() {
 
-    // Called once after isFinished returns true
-    protected void end() {
+  }
 
-    }
-
-    // Called when another command which requires one or more of the same
-    // subsystems is scheduled to run
-    protected void interrupted() {
-    }
+  // Called when another command which requires one or more of the same
+  // subsystems is scheduled to run
+  protected void interrupted() {
+  }
 }