cameraFeeds

[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..ba0f267857503dc1dce4ccecf4bd889ad64e44d6 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -75,17 +75,15 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
-<<<<<<< HEAD
 
-=======
     cameraFeeds.init();
->>>>>>> implement CameraFeeds into robot.java and add todos
+
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-    cameraFeeds.run();
+    
 
   }
 }