Fix conflict in Shooter

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 66b7f47dd13c1b47c9858dfbeeb1f67ff64f3610..5e9bd3cbdb496727cd9722efc1630c5ad13c2228 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -59,10 +59,7 @@ public class Robot extends IterativeRobot {
   @Override
   public void autonomousInit() {
     driveTrain.setHighGear();
-<<<<<<< HEAD
     driveTrain.setCANTalonsBrakeMode(driveTrain.DRIVE_COAST_MODE);
-=======
->>>>>>> Add code to toggle agitator pistons in RunIndexWheelContinuous
   }
 
   @Override