From: niyatisriram <niyatisriram@gmail.com>
Date: Wed, 17 Feb 2016 21:01:46 +0000 (-0800)
Subject: Fix merge conflicts
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=68e554b243aad0de65f60658ff21ec893119d526

Fix merge conflicts
---

68e554b243aad0de65f60658ff21ec893119d526
diff --cc src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index 0d9187a4,ab5eb66f..6e0c7acf
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@@ -49,7 -51,10 +51,12 @@@ public class Shooter extends Subsystem 
     */
  
    public boolean isBallInside() {
-     return photogate.isBallPresent();
++
+     if (usePhotogate())
+       return photogate.isBallPresent();
+     else
+       return true;
++
    }
  
    public void setSpeed(double speed) {