change javadoc comment for areRollersRolling method

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index fb7b08df05098f8bdda2b52e218c1cd684e8192b..0cb8165ac4a093d8bf9cb5c7d346d55841add004 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -88,17 +88,12 @@ public class IntakeArm extends Subsystem {
   }
 
   /***
-   *
-   * @return
-   *         >>>>>>> reset to unix format
-   *         =======
-   *         This method checks to see if the motors controlling the rollers are
-   *         currently running.
+   * This method checks to see if the motors controlling the rollers are
+   * currently running.
    *
    * @return Returns whether the motors are currently running, and returns the
    *         state of the condition (true or false).
-   *         >>>>>>> add 3 method stubs- setRollerSpeeds, getRollerSpeeds, and
-   *         areRollersRolling
+   * 
    */
 
   public boolean areRollersRolling() {