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

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