Remove random files.

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / OI.java

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index 87f069bdb8ce692ad33721fcbb7ed4d570bd3d89..6a99c9756c08e66da78a81fc1d96eea9b04da88f 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,14 +1,7 @@
 package org.usfirst.frc.team3501.robot;
 
-
-
-import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
-=======
 import org.usfirst.frc.team3501.robot.commands.accessories.ToggleCameraFeed;
->>>>>>> added command for toggling camera feeds
-=======
-import org.usfirst.frc.team3501.robot.commands.accessories.ToggleCameraFeed;
->>>>>>> cb0f662264528bcb0d783fcb00db22eb8d4f4283
+import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
@@ -25,8 +18,6 @@ public class OI {
 
   public static Button toggleCameraFeeds;
 
-  public static Button toggleCameraFeeds;
-
   public static Button toggleGear;
 
   public OI() {
@@ -39,19 +30,17 @@ public class OI {
     toggleFlyWheel = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_FLYWHEEL_PORT);
 
-
     toggleGear = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_GEAR_PORT);
     toggleGear.whenPressed(new ToggleGear());
 
-
-    toggleCameraFeeds = new JoystickButton(leftJoystick, Constants.OI.TOGGLE_CAMERA_FEEDS);
+    toggleCameraFeeds = new JoystickButton(leftJoystick,
+        Constants.OI.TOGGLE_CAMERA_FEEDS);
 
     toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
 
-
-
-    toggleCameraFeeds = new JoystickButton(leftJoystick, Constants.OI.TOGGLE_CAMERA_FEEDS);
+    toggleCameraFeeds = new JoystickButton(leftJoystick,
+        Constants.OI.TOGGLE_CAMERA_FEEDS);
 
     toggleCameraFeeds.whenReleased(new ToggleCameraFeed());