reset to unix format

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / subsystems / Scaler.java

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java b/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java
index 09f73021d0b34a19464119ed94734d7ff3fd3785..3c47a4764fd9c7cf401f0e16002981783bed6b35 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Scaler.java
@@ -15,16 +15,8 @@ public class Scaler extends Subsystem {
     piston = new DoubleSolenoid(Constants.Scaler.FORWARD_CHANNEL,
         Constants.Scaler.REVERSE_CHANNEL);
     winch = new CANTalon(Constants.Scaler.WINCH_MOTOR);
-
-  }
-
-<<<<<<< 39cd129b533ffb726c00d5d5cd98b541a25d23bd
-  public void setPistonStatus(int status) {
-
   }
 
-=======
->>>>>>> Add set motor speed methods in defense arm and add potentiometer getter methods
   public Value getSolenoidValue() {
     return piston.get();
   }
@@ -53,12 +45,10 @@ public class Scaler extends Subsystem {
     winch.set(speed);
   }
 
-<<<<<<< 39cd129b533ffb726c00d5d5cd98b541a25d23bd
-=======
   /***
    * This method returns boolean value true or false on whether piston is
    * extended or not.
-   * 
+   *
    * @return
    *         returns true if piston is extended, false if otherwise.
    */
@@ -81,7 +71,7 @@ public class Scaler extends Subsystem {
   /***
    * This method sets the piston status for the scissor lift.
    * The piston can either be extended or not extended.
-   * 
+   *
    * @param status
    *          The status of the piston.
    *          0 for the piston to be extended, 1 for the piston to not be
@@ -92,13 +82,8 @@ public class Scaler extends Subsystem {
 
   }
 
->>>>>>> Add set motor speed methods in defense arm and add potentiometer getter methods
   @Override
   protected void initDefaultCommand() {
 
   }
-<<<<<<< 39cd129b533ffb726c00d5d5cd98b541a25d23bd
-=======
-
->>>>>>> Add set motor speed methods in defense arm and add potentiometer getter methods
 }