From 92adc9db401ec645a3243fd287f665c63632f695 Mon Sep 17 00:00:00 2001 From: Shaina Chen Date: Thu, 4 Feb 2016 19:32:53 -0800 Subject: [PATCH] change javadoc comment for isBallInside method --- .../frc/team3501/robot/subsystems/IntakeArm.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java index 9ade6317..fb7b08df 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java @@ -77,16 +77,10 @@ public class IntakeArm extends Subsystem { } /*** - * <<<<<<< cefeac7a7bb7df62af5c880e13eb37c14125a7cb - * <<<<<<< bd5dc4363add71a17f95409115dec96b83146549 - * This method checks to see if the motors controlling the rollers are - * currently working. + * This method checks to see if the presence of the ball inside is true or + * false. * - * @return Returns whether the motors are currently running, and returns the - * state of the condition (true or false). - * ======= - * - * @return + * @return Returns whether the ball is inside as true or false */ public boolean isBallInside() { -- 2.30.2