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 7bcd0ad34488492e27b44ffc29158706e0501a7f..432b068d8cf24fbcd50302a505c09356527d77ea 100644 (file)
--- 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 008369aecf8f9838b9cf88079d13e60aba90dfae..b6abd8468af0d352e906282c8dd93a4584505ba9 100644 (file)
--- 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