From: Kevin Zhang <icestormf1@gmail.com>
Date: Sun, 31 Jan 2016 00:41:26 +0000 (-0800)
Subject: Reset IntakeArm.java to unix format
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=7b11350e3c804ca1eb34b23249c61f004beef0e0

Reset IntakeArm.java to unix format
---

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index 6105a7a8..8343a8b2 100755
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -1,41 +1,41 @@
-package org.usfirst.frc.team3501.robot.subsystems;
-
-import org.usfirst.frc.team3501.robot.Constants;
-
-import edu.wpi.first.wpilibj.CANTalon;
-import edu.wpi.first.wpilibj.command.Subsystem;
-
-public class IntakeArm extends Subsystem {
-
-  private CANTalon intake;
-  private CANTalon chevalDeFriseHand;
-
-  public IntakeArm() {
-    intake = new CANTalon(Constants.IntakeArm.PORT);
-
-  }
-
-  /*
-   * Intake only moves once at the beginning of the match. It lowers at the
-   * beginning of the match and is held there by mechanical stops until the end
-   * of the match.
-   * 
-   * Must be used in a command that has a timer variable to stop it.
-   */
-  public void dropIntake() {
-    intake.set(0.3);
-  }
-
-  public void intake() {
-    intake.set(Constants.IntakeArm.INTAKE_SPEED);
-  }
-
-  public void output() {
-    intake.set(Constants.IntakeArm.OUTPUT_SPEED);
-  }
-
-  @Override
-  protected void initDefaultCommand() {
-
-  }
-}
+package org.usfirst.frc.team3501.robot.subsystems;
+
+import org.usfirst.frc.team3501.robot.Constants;
+
+import edu.wpi.first.wpilibj.CANTalon;
+import edu.wpi.first.wpilibj.command.Subsystem;
+
+public class IntakeArm extends Subsystem {
+
+  private CANTalon intake;
+  private CANTalon chevalDeFriseHand;
+
+  public IntakeArm() {
+    intake = new CANTalon(Constants.IntakeArm.PORT);
+
+  }
+
+  /*
+   * Intake only moves once at the beginning of the match. It lowers at the
+   * beginning of the match and is held there by mechanical stops until the end
+   * of the match.
+   * 
+   * Must be used in a command that has a timer variable to stop it.
+   */
+  public void dropIntake() {
+    intake.set(0.3);
+  }
+
+  public void intake() {
+    intake.set(Constants.IntakeArm.INTAKE_SPEED);
+  }
+
+  public void output() {
+    intake.set(Constants.IntakeArm.OUTPUT_SPEED);
+  }
+
+  @Override
+  protected void initDefaultCommand() {
+
+  }
+}