X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FOI.java;h=6a99c9756c08e66da78a81fc1d96eea9b04da88f;hb=c4a90614dbd1e208351088b5fbc9d23ef36588ac;hp=07634e7e03e5643082ea3947bd5052fa2e9c67b2;hpb=9cb4e4176da7de9c3ef80bf5132e9bae7a566e2d;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index 07634e7..6a99c97 100644
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,10 +1,7 @@
 package org.usfirst.frc.team3501.robot;
 
-<<<<<<< HEAD
-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.driving.ToggleGear;
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
@@ -18,7 +15,7 @@ public class OI {
 
   public static Button toggleIndexWheel;
   public static Button toggleFlyWheel;
-  
+
   public static Button toggleCameraFeeds;
 
   public static Button toggleGear;
@@ -32,16 +29,21 @@ public class OI {
         Constants.OI.TOGGLE_INDEXWHEEL_PORT);
     toggleFlyWheel = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_FLYWHEEL_PORT);
-<<<<<<< HEAD
+
     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());
->>>>>>> added command for toggling camera feeds
+
+    toggleCameraFeeds = new JoystickButton(leftJoystick,
+        Constants.OI.TOGGLE_CAMERA_FEEDS);
+
+    toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
+
   }
 
   public static OI getOI() {