X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FOI.java;h=a9948d7ae500cce9d4167a140ce592530b40c59e;hb=5bee67e1c82f6a9e7f12a1e217b1fb80beb616bf;hp=07634e7e03e5643082ea3947bd5052fa2e9c67b2;hpb=748d3e144c059456450bcce65c84cfb7d4423f85;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..a9948d7 100644
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,6 +1,6 @@
 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;
@@ -18,7 +18,7 @@ public class OI {
 
   public static Button toggleIndexWheel;
   public static Button toggleFlyWheel;
-  
+
   public static Button toggleCameraFeeds;
 
   public static Button toggleGear;
@@ -32,16 +32,16 @@ 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.whenReleased(new ToggleCameraFeed());
->>>>>>> added command for toggling camera feeds
+
   }
 
   public static OI getOI() {