From: Andres Esteban Echeverria G <estebanech@Andress-MacBook-Air.local>
Date: Sun, 5 Feb 2017 01:08:47 +0000 (-0800)
Subject: Made final int for toggling camera feeds equal to 7(button 7)
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=0c746368c4dd945e3f1095011b12b9783d4bc05b

Made final int for toggling camera feeds equal to 7(button 7)
---

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 7bcd0ad..432b068 100644
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -17,7 +17,11 @@ public class Constants {
     public final static int TOGGLE_WINCH_PORT = 0;
     public final static int TOGGLE_FLYWHEEL_PORT = 0;
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;
+<<<<<<< HEAD
     public final static int TOGGLE_GEAR_PORT = 0;
+=======
+	public static final int TOGGLE_CAMERA_FEEDS = 7;
+>>>>>>> Made final int for toggling camera feeds equal to 7(button 7)
   }
 
   public static class Shooter {
diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 008369a..b6abd84 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -75,11 +75,9 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
-<<<<<<< HEAD
 
-=======
     cameraFeeds.init();
->>>>>>> implement CameraFeeds into robot.java and add todos
+
   }
 
   @Override