Fix merge conflicts.

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

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index a40334d01c5bdfc3cbd6eda96790d9e001ab6cce..6c3a6adabe85c45964c0fceb3a202557af99cd55 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -20,7 +20,7 @@ public class Constants {
 
     public final static int TOGGLE_GEAR_PORT = 0;
 
-    public static final int TOGGLE_CAMERA_FEEDS = 4;
+    public static final int TOGGLE_CAMERA_FEEDS = 1;
 
   }