From: Rohan Rodrigues <rohanrodrigues19@gmail.com>
Date: Thu, 9 Mar 2017 01:14:29 +0000 (-0800)
Subject: Fix conflict in Shooter
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=9d31eab2633c58781fae0e346b2eae542595d7af

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 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