X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=66b7f47dd13c1b47c9858dfbeeb1f67ff64f3610;hb=b30e6822d5baa8ebff5f6320a4d7da9c992fd4a7;hp=5e9bd3cbdb496727cd9722efc1630c5ad13c2228;hpb=b6c65122a978685703718a9d0f1d8ee012cbf9c8;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 5e9bd3c..66b7f47 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -59,7 +59,10 @@ 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