X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=b6abd8468af0d352e906282c8dd93a4584505ba9;hb=0c746368c4dd945e3f1095011b12b9783d4bc05b;hp=008369aecf8f9838b9cf88079d13e60aba90dfae;hpb=4bc0cb18b1141e13dd372538d1e09c91a5f8d910;p=3501%2F2017steamworks

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