From f8856d62d44eec5a4f73be7acc85c601746e87a4 Mon Sep 17 00:00:00 2001 From: Shaina Chen Date: Thu, 4 Feb 2016 19:34:37 -0800 Subject: [PATCH] change javadoc comment for areRollersRolling method --- .../frc/team3501/robot/subsystems/IntakeArm.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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() { -- 2.30.2