From 5727bf883d171e3cedbe46d515d4b12e86e8c1da Mon Sep 17 00:00:00 2001 From: Rohan Rodrigues Date: Wed, 8 Mar 2017 17:01:14 -0800 Subject: [PATCH] Fix conflict in Constants --- src/org/usfirst/frc/team3501/robot/Constants.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index 197f76e..312e0c3 100644 --- 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; } -- 2.30.2