Fix conflict in Constants

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 197f76ea13c21db2385dd83c22b8cd82138b5a01..312e0c355a8b584dcda01b230f30bb15d121471a 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -40,16 +40,11 @@ public class Constants {
 
     public final static int HALL_EFFECT_PORT = 9;
 
-<<<<<<< HEAD
     public final static int TOGGLE_INDEXER = 8;
 
     public static final int MODULE_NUMBER = 10, PISTON_FORWARD = 4,
         PISTON_REVERSE = 5;
 
-=======
-    public static final int PISTON_MODULE = 10, PISTON_FORWARD = 0,
-        PISTON_REVERSE = 1;
->>>>>>> Add code to alternate pistons in runIndexWheelContinuous
     public static final Value HIGH_GEAR = DoubleSolenoid.Value.kForward;
     public static final Value LOW_GEAR = DoubleSolenoid.Value.kReverse;
   }