added command for toggling camera feeds

[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 432b068d8cf24fbcd50302a505c09356527d77ea..7164c7b996b0d839bf74339018f79f93d407177e 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -17,11 +17,11 @@ public class Constants {
     public final static int TOGGLE_WINCH_PORT = 0;
     public final static int TOGGLE_FLYWHEEL_PORT = 0;
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;
-<<<<<<< HEAD
+
     public final static int TOGGLE_GEAR_PORT = 0;
-=======
-       public static final int TOGGLE_CAMERA_FEEDS = 7;
->>>>>>> Made final int for toggling camera feeds equal to 7(button 7)
+
+    public static final int TOGGLE_CAMERA_FEEDS = 7;
+
   }
 
   public static class Shooter {