From: Rayan Hirech <ramine411@gmail.com>
Date: Sun, 12 Feb 2017 00:22:37 +0000 (-0800)
Subject: Fix merge conflicts
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=3788e02d7289dbc13d2478bd94050f1c639fae7a

Fix merge conflicts
---

3788e02d7289dbc13d2478bd94050f1c639fae7a
diff --cc src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index 07cf52e,b18fbca..d1b0ac0
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@@ -20,8 -20,8 +20,8 @@@ public class CameraFeeds 
    private CameraFeeds(/* Joystick Button */) {
      System.out.println("Enter CameraFeeds constructor");
      server = CameraServer.getInstance();
-     climberCam = server.addAxisCamera("AxisCamera", "10.35.1.11");
+     climberCam = server.addAxisCamera("ClimberCam", "10.35.1.11");
 -    // intakeCam = server.startAutomaticCapture();
 +    intakeCam = server.startAutomaticCapture();
      usbCamName = intakeCam.getName();
      axisCamName = climberCam.getName();
      curCam = climberCam;