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

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / Robot.java

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