From 5bee67e1c82f6a9e7f12a1e217b1fb80beb616bf Mon Sep 17 00:00:00 2001
From: Rayan Hirech <ramine411@gmail.com>
Date: Mon, 6 Feb 2017 19:55:06 -0800
Subject: [PATCH] Commiting so I can pull

---
 src/org/usfirst/frc/team3501/robot/OI.java    | 14 +++++++-------
 src/org/usfirst/frc/team3501/robot/Robot.java |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

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() {
diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index ba0f267..c8ef568 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -26,7 +26,7 @@ public class Robot extends IterativeRobot {
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
 
-    usbCamera = CameraServer.getInstance().startAutomaticCapture();
+    // usbCamera = CameraServer.getInstance().startAutomaticCapture();
 
     // cameraServer2 = CameraServer;getInstance();
     // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
@@ -83,7 +83,6 @@ public class Robot extends IterativeRobot {
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-    
 
   }
 }
-- 
2.30.2