fix conflicts

[3501/2015-FRC-Spark] / src / org / usfirst / frc3501 / RiceCatRobot / subsystems / Arm.java

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
index be8cfa8c7ccec0e49c39ce15d97b68cf38cdc4d1..e20a822938fa2a66c26bd39bebfed9b74d3fb013 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
@@ -6,42 +6,42 @@ import edu.wpi.first.wpilibj.CANJaguar;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
 public class Arm extends Subsystem {
-    private CANJaguar left, right;
-
-    public Arm() {
-        left = new CANJaguar(RobotMap.ARM_LEFT);
-        right = new CANJaguar(RobotMap.ARM_RIGHT);
-    }
-
-    public void initDefaultCommand() {
-    }
-
-    public void fineTuneControl(double d) {
-        if (Math.abs(d) < 0.05) {
-            d = 0;
-        } else if (d > 0) {
-            d *= d;
-        } else {
-            d *= -d;
-        }
-        setArmSpeeds(d);
-    }
-
-    public void setLeft(double speed) {
-        left.set(-speed);
-    }
-
-    public void setRight(double speed) {
-        right.set(-speed);
-    }
-
-    public void setArmSpeeds(double speed) {
-        setLeft(speed);
-        setRight(speed);
-    }
-
-    public void stop() {
-        left.set(0);
-        right.set(0);
+  private CANJaguar left, right;
+
+  public Arm() {
+    left = new CANJaguar(RobotMap.ARM_LEFT);
+    right = new CANJaguar(RobotMap.ARM_RIGHT);
+  }
+
+  public void initDefaultCommand() {
+  }
+
+  public void fineTuneControl(double d) {
+    if (Math.abs(d) < 0.05) {
+      d = 0;
+    } else if (d > 0) {
+      d *= d;
+    } else {
+      d *= -d;
     }
+    setArmSpeeds(d);
+  }
+
+  public void setLeft(double speed) {
+    left.set(-speed);
+  }
+
+  public void setRight(double speed) {
+    right.set(-speed);
+  }
+
+  public void setArmSpeeds(double speed) {
+    setLeft(speed);
+    setRight(speed);
+  }
+
+  public void stop() {
+    left.set(0);
+    right.set(0);
+  }
 }