From 9d31eab2633c58781fae0e346b2eae542595d7af Mon Sep 17 00:00:00 2001
From: Rohan Rodrigues <rohanrodrigues19@gmail.com>
Date: Wed, 8 Mar 2017 17:14:29 -0800
Subject: [PATCH] Fix conflict in Shooter

---
 src/org/usfirst/frc/team3501/robot/Robot.java | 3 ---
 1 file changed, 3 deletions(-)

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