remove ^M

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java b/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java
index 97c2e955957aaefac7b8b9964a888ac1477cc537..0ef62a4293a9bbeb8733cb6b058ca9e462bf8bd9 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java
@@ -1,41 +1,41 @@
-package org.usfirst.frc.team3501.robot.subsystems;\r
-import org.usfirst.frc.team3501.robot.Constants;\r
-\r
-import edu.wpi.first.wpilibj.DoubleSolenoid;\r
-import edu.wpi.first.wpilibj.DoubleSolenoid.Value;\r
-import edu.wpi.first.wpilibj.command.Subsystem;\r
-\r
-public class Scaler extends Subsystem {\r
-       //Scaler related objects\r
-       private DoubleSolenoid piston;\r
-       \r
-       \r
-       public Scaler() {\r
-               piston = new DoubleSolenoid(Constants.Scaler.FORWARD_CHANNEL, Constants.Scaler.REVERSE_CHANNEL);\r
-       }\r
-\r
-       @Override\r
-       protected void initDefaultCommand() {\r
-\r
-       }\r
-       public Value getSolenoidValue(){\r
-               return piston.get();\r
-       }\r
-       \r
-       public void lift(){\r
-               piston.set(DoubleSolenoid.Value.kReverse);\r
-       }\r
-       \r
-       public void lower(){\r
-               piston.set(DoubleSolenoid.Value.kForward);\r
-       }\r
-       \r
-       public void disengageHook(){\r
-               \r
-       }\r
-       \r
-       public void runWinch(){\r
-               \r
-       }\r
-       \r
-}\r
+package org.usfirst.frc.team3501.robot.subsystems;
+import org.usfirst.frc.team3501.robot.Constants;
+
+import edu.wpi.first.wpilibj.DoubleSolenoid;
+import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
+import edu.wpi.first.wpilibj.command.Subsystem;
+
+public class Scaler extends Subsystem {
+       //Scaler related objects
+       private DoubleSolenoid piston;
+       
+       
+       public Scaler() {
+               piston = new DoubleSolenoid(Constants.Scaler.FORWARD_CHANNEL, Constants.Scaler.REVERSE_CHANNEL);
+       }
+
+       @Override
+       protected void initDefaultCommand() {
+
+       }
+       public Value getSolenoidValue(){
+               return piston.get();
+       }
+       
+       public void lift(){
+               piston.set(DoubleSolenoid.Value.kReverse);
+       }
+       
+       public void lower(){
+               piston.set(DoubleSolenoid.Value.kForward);
+       }
+       
+       public void disengageHook(){
+               
+       }
+       
+       public void runWinch(){
+               
+       }
+       
+}