From: Shaina Chen <shaina.sierra@gmail.com>
Date: Fri, 5 Feb 2016 03:34:37 +0000 (-0800)
Subject: change javadoc comment for areRollersRolling method
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=f8856d62d44eec5a4f73be7acc85c601746e87a4

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 fb7b08df..0cb8165a 100755
--- 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() {