change javadoc comment for isBallInside method

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index 9ade6317de93cea5e143bf3cf04828d5ad3df40a..fb7b08df05098f8bdda2b52e218c1cd684e8192b 100755 (executable)
--- 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() {